Redo the nautilus-search branch, it's just easier to recreate the

branch rather than update the code

81 files changed, 13604 insertions, 5927 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d3afe0f0..341f29300 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,148 +1,3 @@
-2005-09-20  christian neumair  <chris@gnome-de.org>
-
-	* src/nautilus-connect-server-dialog.c: (connect_to_server):
-	Fix leak and crasher. Fixes #314730.
-
-	* src/file-manager/fm-directory-view.c: (connect_proxy):
-	Don't poke around with null pixbuf if icon theme lookup failed.
-
-	* libnautilus-private/nautilus-desktop-directory-file.c:
-	(desktop_directory_file_get_deep_counts):
-	* libnautilus-private/nautilus-file.c:
-	(nautilus_file_get_deep_counts),
-	(nautilus_file_get_string_attribute_with_default:):
-	* libnautilus-private/nautilus-file.h:
-	* libnautilus-private/nautilus-trash-file.c:
-	(trash_file_get_deep_counts):
-	* src/file-manager/fm-properties-window.c:
-	(directory_contents_value_field_update),
-	(attach_directory_contents_value_field),
-	(update_visibility_of_item_count_fields),
-	(update_visibility_of_item_count_fields_wrapper),
-	(remember_directory_contents_widget),
-	(append_directory_contents_fields), (real_destroy):
-	Add force flag to nautilus_file_get_deep_counts, which forces
-	generation even if the "show deep count" preference is turned off.
-	pass TRUE in property window and FALSE everywhere else. Fixes #126068.
-
-2005-09-19  Nate Nielsen <nielsen@memberwebs.com>
-
-	* nautilus-connect-server-dialog-main.c: (main):
-	* nautilus-connect-server-dialog.h:
-	* nautilus-connect-server-dialog.c:
-	(nautilus_connect_server_dialog_new):
-	* nautilus-window-menus.c:
-	(action_connect_to_server_callback): 
-	Autofill "Connect to server" dialog where possible.
-	Fixes #314745
-
-2005-09-19  Christian Neumair  <chris@gnome-de.org>
-
-	* libnautilus-private/nautilus-file-operations.c:
-	(nautilus_file_operations_copy_move),:
-	Try to use the trash associated with a symlink's parent directory if
-	resolution fails because of broken symlink when moving symlink to
-	trash.
-
-	* libnautilus-private/nautilus-file-operations.c:
-	(nautilus_self_check_file_operations):
-	Fix date self checks. Fixes #47364.
-
-2005-09-19  Alexander Larsson  <alexl@redhat.com>
-
-	* icons/Makefile.am:
-	* icons/Search.png:
-	* icons/nautilus-desktop.png:
-	* icons/nautilus-file-management-properties.png:
-	* icons/nautilus-mini-logo.png:
-	* icons/nautilus-server-connect.png:
-	* icons/side_bar_image.png:
-	Remove unused icons (#315990)
-	Patch from Jaap A. Haitsma
-	
-2005-09-19  Christian Neumair  <chris@gnome-de.org>
-
-	* libnautilus-private/nautilus-metafile.c: (copy_file_metadata):
-	* libnautilus-private/nautilus-thumbnails.c:
-	(nautilus_update_thumbnail_file_copied),
-	(nautilus_update_thumbnail_file_renamed),
-	(nautilus_remove_thumbnail_for_file):
-	* libnautilus-private/nautilus-thumbnails.h:
-	Copy thumbnails when copying file metadata. Fixes #45191.
-
-2005-09-19  Christian Neumair  <chris@gnome-de.org>
-
-	* src/file-manager/fm-list-view.c: (drag_begin_callback),
-	(motion_notify_callback):
-	Setup drag in the "drag-begin" handler.
-
-2005-09-19  Alexander Larsson  <alexl@redhat.com>
-
-	* libnautilus-private/nautilus-icon-container.[ch]:
-	* libnautilus-private/nautilus-icon-private.h:
-	Add support for lazily positioned icons.
-	
-	* libnautilus-private/nautilus-icon-dnd.c: (handle_local_move):
-	* src/file-manager/fm-icon-view.c: (fm_icon_view_add_file),
-	(fm_icon_view_screen_changed):
-	Use lazily positioned icons for desktop icons. (#45953)
-
-	Patch from Christian Neumair  <chris@gnome-de.org>
-
-2005-09-10  Erdal Ronahi  <erdal.ronahi@gmail.com>
-
-        * confiure.in: Added "ku" (Kurdish) to ALL_LINGUAS
-
-2005-09-08  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #171073:
-
-	* libnautilus-private/nautilus-trash-directory.c
-	(nautilus_trash_directory_instance_init): In addition to
-	connecting to "volume_pre_unmount" on the volume monitor, also
-	connect to "volume_unmounted".  This will let the trash clean up
-	its merged directory even if the unmount is not initiated from
-	Nautilus.
-	
-	* libnautilus-private/nautilus-merged-directory.c
-	(merged_remove_real_directory): When a real directory is removed
-	from the merged directory, emit notifications to that effect.
-	This lets the trash window remove the icons that used to
-	correspond to a volume that got unmounted.
-	(real_directory_notify_files_removed): New utility function.
-
-2005-09-06  Christian Neumair  <chris@gnome-de.org>
-
-	* src/file-manager/fm-list-view.c: (fm_list_view_init): Ensure that
-	the zoom level is initialized correctly in fm_list_view_begin_loading.
-	Fixes #314269.
-
-2005-09-06  Alexander Larsson  <alexl@redhat.com>
-
-	* libnautilus-private/nautilus-directory-async.c:
-	(nautilus_directory_monitor_add_internal),
-	(nautilus_directory_monitor_remove_internal):
-	* libnautilus-private/nautilus-file-private.h:
-	* libnautilus-private/nautilus-file.c: (finalize):
-	Only use directory monitors to avoid using lots and lots of
-	file monitors. This is an optimization in almost all cases, although
-	it does a bit more work when viewing a file properties dialog with the
-	containing folder window hidden. (#315041)
-
-2005-09-06  Christian Neumair  <chris@gnome-de.org>
-
-	* src/file-manager/fm-directory-view.c: (add_extension_menu_items),
-	(get_unique_files), (reset_extension_actions_menu): Always pass all
-	selected files to extension, instead of passing max. 1 per selected
-	MIME type. Fixes #314721.
-
-2005-09-05  Alexander Larsson  <alexl@redhat.com>
-
-	* configure.in:
-	Post release version bump.
-
-=== nautilus 2.12.0 ===
-
 2005-09-05  Alexander Larsson  <alexl@redhat.com>
 
 	* configure.in:
diff --git a/configure.in b/configure.in
index a54f4bf32..032e58c0c 100644
--- a/configure.in
+++ b/configure.in
@@ -19,8 +19,9 @@ m4_define(rsvg_minver,                 2.0.1)
 m4_define(xml_minver,                  2.4.7)
 m4_define(startup_notification_minver, 0.8)
 m4_define(exif_minver,                 0.5.12)
+m4_define(beagle_minver,               0.0.12)
 
-AC_INIT(nautilus, 2.12.1,
+AC_INIT(nautilus, 2.12.0,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus])
 
 dnl ===========================================================================
@@ -98,7 +99,7 @@ PKG_CHECK_MODULES(ALL, [
 ])
 dnl ==========================================================================
 
-ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko ku li lt lv mi mk ml mn ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tk tr uk vi wa xh yi zh_CN zh_TW zu"
+ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko li lt lv mi mk ml mn ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tk tr uk vi wa xh yi zh_CN zh_TW zu"
 
 GETTEXT_PACKAGE=nautilus
 AC_SUBST(GETTEXT_PACKAGE)
@@ -224,6 +225,20 @@ PKG_CHECK_MODULES(EXIF, libexif > exif_minver, [
       AC_SUBST(EXIF_LIBS)
 ])])
 
+
+dnl ==========================================================================
+
+dnl libbeagle checking
+
+AC_MSG_CHECKING(for libbeagle)
+
+PKG_CHECK_MODULES(BEAGLE, libbeagle-0.0 >= beagle_minver, [
+    AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support])
+    AC_SUBST(BEAGLE_CFLAGS)
+    AC_SUBST(BEAGLE_LIBS)
+    AM_CONDITIONAL(HAVE_BEAGLE, true)
+], [])
+
 dnl ==========================================================================
 
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
diff --git a/icons/Makefile.am b/icons/Makefile.am
index cbb447e31..b0489e0a3 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -3,17 +3,23 @@ NULL=
 icondir = $(datadir)/pixmaps/nautilus
 
 icon_DATA =\
+	Search.png \
 	audio.svg \
 	backgrounds.png \
 	chit_frame.png \
 	colors.png \
 	emblems.png \
-	erase.png \
 	knob.png \
+	nautilus-desktop.png \
 	nautilus-launch-icon.png \
+	nautilus-mini-logo.png \
+	nautilus-server-connect.png \
+	nautilus-file-management-properties.png \
 	note-indicator.png \
+	side_bar_image.png \
 	text-selection-frame.png \
 	thumbnail_frame.png \
+	erase.png \
 	$(NULL)
 
 EXTRA_DIST = $(icon_DATA)
diff --git a/icons/Search.png b/icons/Search.png
new file mode 100644
index 000000000..b324cbc2b
--- /dev/null
+++ b/icons/Search.png
diff --git a/icons/nautilus-desktop.png b/icons/nautilus-desktop.png
new file mode 100644
index 000000000..e3107a6e0
--- /dev/null
+++ b/icons/nautilus-desktop.png
diff --git a/icons/nautilus-file-management-properties.png b/icons/nautilus-file-management-properties.png
new file mode 100644
index 000000000..05921a668
--- /dev/null
+++ b/icons/nautilus-file-management-properties.png
diff --git a/icons/nautilus-mini-logo.png b/icons/nautilus-mini-logo.png
new file mode 100644
index 000000000..fe1273142
--- /dev/null
+++ b/icons/nautilus-mini-logo.png
diff --git a/icons/nautilus-server-connect.png b/icons/nautilus-server-connect.png
new file mode 100644
index 000000000..cb504eb82
--- /dev/null
+++ b/icons/nautilus-server-connect.png
diff --git a/icons/side_bar_image.png b/icons/side_bar_image.png
new file mode 100644
index 000000000..ee65b95af
--- /dev/null
+++ b/icons/side_bar_image.png
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index d9c158d50..7ba0e549a 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = 						\
 	-I$(top_srcdir)/cut-n-paste-code		\
 	$(CORE_CFLAGS)					\
 	$(DISABLE_DEPRECATED_CFLAGS)			\
+	$(BEAGLE_CFLAGS)				\
 	-DDATADIR=\""$(datadir)"\" 			\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	\
@@ -28,6 +29,7 @@ libnautilus_private_la_LDFLAGS =	\
 	-no-undefined			\
 	$(dependency_static_libs)	\
 	$(CORE_LIBS)			\
+	$(BEAGLE_LIBS)			\
 	$(NULL)
 
 nautilus_metafile_server_idl_sources = \
@@ -151,10 +153,18 @@ libnautilus_private_la_SOURCES = \
 	nautilus-program-choosing.h \
 	nautilus-recent.c \
 	nautilus-recent.h \
+	nautilus-search-directory.c \
+	nautilus-search-directory.h \
+	nautilus-search-directory-file.c \
+	nautilus-search-directory-file.h \
+	nautilus-search-engine.c \
+	nautilus-search-engine.h \
 	nautilus-sidebar-provider.c \
 	nautilus-sidebar-provider.h \
 	nautilus-sidebar.c \
 	nautilus-sidebar.h \
+	nautilus-query.c \
+	nautilus-query.h \
 	nautilus-thumbnails.c \
 	nautilus-thumbnails.h \
 	nautilus-trash-directory.c \
@@ -188,6 +198,12 @@ libnautilus_private_la_SOURCES = \
 	nautilus-window-info.h \
 	$(NULL)
 
+if HAVE_BEAGLE
+libnautilus_private_la_SOURCES += \
+	nautilus-search-engine-beagle.c
+	nautilus-search-engine-beagle.h
+endif
+
 $(lib_LTLIBRARIES): $(dependency_static_libs)
 
 $(nautilus_metafile_server_idl_sources): nautilus_metafile_server_idl_stamp
diff --git a/libnautilus-private/nautilus-desktop-directory-file.c b/libnautilus-private/nautilus-desktop-directory-file.c
index 65516a633..49bd4d84c 100644
--- a/libnautilus-private/nautilus-desktop-directory-file.c
+++ b/libnautilus-private/nautilus-desktop-directory-file.c
@@ -413,8 +413,7 @@ desktop_directory_file_get_deep_counts (NautilusFile *file,
 						directory_count,
 						file_count,
 						unreadable_directory_count,
-						total_size,
-						TRUE);
+						total_size);
 
 	if (file_count) {
 		*file_count += g_list_length (file->details->directory->details->file_list);
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 7d7f1d5c5..0ed6f0aa9 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -479,6 +479,35 @@ find_monitor (NautilusDirectory *directory,
 				   monitor_key_compare);
 }
 
+static int
+monitor_file_compare (gconstpointer a,
+		      gconstpointer data)
+{
+	const Monitor *monitor;
+	NautilusFile *file;
+
+	monitor = a;
+	file = (NautilusFile *) data;
+	
+	if (monitor->file < file) {
+		return -1;
+	}
+	if (monitor->file > file) {
+		return +1;
+	}
+	
+	return 0;
+}
+
+static gboolean
+find_any_monitor (NautilusDirectory *directory,
+		  NautilusFile *file)
+{
+	return g_list_find_custom (directory->details->monitor_list,
+				   file,
+				   monitor_file_compare) != NULL;
+}
+
 static void
 remove_monitor_link (NautilusDirectory *directory,
 		     GList *link)
@@ -594,6 +623,7 @@ nautilus_directory_monitor_add_internal (NautilusDirectory *directory,
 {
 	Monitor *monitor;
 	GList *file_list;
+	char *file_uri;
 
 	g_assert (NAUTILUS_IS_DIRECTORY (directory));
 
@@ -619,12 +649,16 @@ nautilus_directory_monitor_add_internal (NautilusDirectory *directory,
 	}
 	
 	/* Start the "real" monitoring (FAM or whatever). */
-	/* We always monitor the whole directory since in practice
-	 * nautilus almost always shows the whole directory anyway, and
-	 * it allows us to avoid one file monitor per file in a directory.
-	 */
-	if (directory->details->monitor == NULL) {
-		directory->details->monitor = nautilus_monitor_directory (directory->details->uri);
+	if (file == NULL) {
+		if (directory->details->monitor == NULL) {
+			directory->details->monitor = nautilus_monitor_directory (directory->details->uri);
+		}
+	} else {
+		if (file->details->monitor == NULL) {
+			file_uri = nautilus_file_get_uri (file);
+			file->details->monitor = nautilus_monitor_file (file_uri);
+			g_free (file_uri);
+		}
 	}
 	
 	/* We could just call update_metadata_monitors here, but we can be smarter
@@ -1002,7 +1036,7 @@ directory_load_done (NautilusDirectory *directory,
 		}
 
 		nautilus_directory_emit_load_error (directory,
-						    result);
+						    result, NULL);
 	}
 
 	/* Call the idle function right away. */
@@ -1095,10 +1129,18 @@ nautilus_directory_monitor_remove_internal (NautilusDirectory *directory,
 
 	remove_monitor (directory, file, client);
 
-	if (directory->details->monitor != NULL
-	    && directory->details->monitor_list == NULL) {
-		nautilus_monitor_cancel (directory->details->monitor);
-		directory->details->monitor = NULL;
+	if (file == NULL) {
+		if (directory->details->monitor != NULL
+		    && !find_any_monitor (directory, NULL)) {
+			nautilus_monitor_cancel (directory->details->monitor);
+			directory->details->monitor = NULL;
+		}
+	} else {
+		if (file->details->monitor != NULL
+		    && !find_any_monitor (directory, file)) {
+			nautilus_monitor_cancel (file->details->monitor);
+			file->details->monitor = NULL;
+		}
 	}
 
 	update_metadata_monitors (directory);
diff --git a/libnautilus-private/nautilus-directory-metafile.c b/libnautilus-private/nautilus-directory-metafile.c
index f056962c0..d5022df27 100644
--- a/libnautilus-private/nautilus-directory-metafile.c
+++ b/libnautilus-private/nautilus-directory-metafile.c
@@ -158,8 +158,6 @@ get_metafile (NautilusDirectory *directory)
 		g_free (uri);
 	}
 
-	g_assert (directory->details->metafile_corba_object != CORBA_OBJECT_NIL);
-	
 	return directory->details->metafile_corba_object;	
 }
 
@@ -168,12 +166,19 @@ nautilus_directory_is_metadata_read (NautilusDirectory *directory)
 {
 	CORBA_Environment ev;
 	gboolean result;
+	Nautilus_Metafile metafile;
 
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE);
 	
 	CORBA_exception_init (&ev);
 
-	result = Nautilus_Metafile_is_read (get_metafile (directory), &ev);
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return TRUE;
+	}
+		
+	result = Nautilus_Metafile_is_read (metafile, &ev);
 
 	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
@@ -191,6 +196,7 @@ nautilus_directory_get_file_metadata (NautilusDirectory *directory,
 	char             *result;
 	const char       *non_null_default;
 	CORBA_char       *corba_value;
+	Nautilus_Metafile metafile;
 
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
 	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
@@ -201,7 +207,13 @@ nautilus_directory_get_file_metadata (NautilusDirectory *directory,
 
 	CORBA_exception_init (&ev);
 
-	corba_value = Nautilus_Metafile_get (get_metafile (directory), file_name, key, non_null_default, &ev);
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return g_strdup (default_metadata);
+	}
+
+	corba_value = Nautilus_Metafile_get (metafile, file_name, key, non_null_default, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Failed to get file metadata.");
@@ -235,16 +247,23 @@ nautilus_directory_get_file_metadata_list (NautilusDirectory *directory,
 	GList                 *result;
 	Nautilus_MetadataList *corba_value;
 	CORBA_unsigned_long    buf_pos;
+	Nautilus_Metafile      metafile;
 
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), 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);
 	
-	CORBA_exception_init (&ev);
+	metafile = get_metafile (directory);
 
-	corba_value = Nautilus_Metafile_get_list (get_metafile (directory), file_name, list_key, list_subkey, &ev);
+	if (metafile == CORBA_OBJECT_NIL) {
+		return NULL;
+	}
 
+	CORBA_exception_init (&ev);
+	
+	corba_value = Nautilus_Metafile_get_list (metafile, file_name, list_key, list_subkey, &ev);
+	
 	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 
@@ -266,11 +285,18 @@ nautilus_directory_set_file_metadata (NautilusDirectory *directory,
 				      const char *metadata)
 {
 	CORBA_Environment ev;
+	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (!eel_str_is_empty (file_name));
 	g_return_if_fail (!eel_str_is_empty (key));
 	
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return;
+	}
+	
 	/* We can't pass NULL as a CORBA_string - pass "" instead.
 	 */
 	if (default_metadata == NULL) {
@@ -282,7 +308,7 @@ nautilus_directory_set_file_metadata (NautilusDirectory *directory,
 
 	CORBA_exception_init (&ev);
 
-	Nautilus_Metafile_set (get_metafile (directory), file_name, key, default_metadata, metadata, &ev);
+	Nautilus_Metafile_set (metafile, file_name, key, default_metadata, metadata, &ev);
 
 	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
@@ -296,7 +322,7 @@ nautilus_directory_set_file_metadata_list (NautilusDirectory *directory,
 					   GList *list)
 {
 	CORBA_Environment ev;
-	
+	Nautilus_Metafile metafile;
 	Nautilus_MetadataList *corba_list;
 	int	len;
 	int	buf_pos;
@@ -306,7 +332,13 @@ nautilus_directory_set_file_metadata_list (NautilusDirectory *directory,
 	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));
-	
+
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return;
+	}
+
 	len = g_list_length (list);
 	
 	corba_list = Nautilus_MetadataList__alloc ();
@@ -329,7 +361,7 @@ nautilus_directory_set_file_metadata_list (NautilusDirectory *directory,
 
 	CORBA_exception_init (&ev);
 
-	Nautilus_Metafile_set_list (get_metafile (directory), file_name, list_key, list_subkey, corba_list, &ev);
+	Nautilus_Metafile_set_list (metafile, file_name, list_key, list_subkey, corba_list, &ev);
 
 	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
@@ -438,17 +470,24 @@ nautilus_directory_copy_file_metadata (NautilusDirectory *source_directory,
 {
 	CORBA_Environment ev;
 	char *destination_uri;
+	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (source_directory));
 	g_return_if_fail (source_file_name != NULL);
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (destination_directory));
 	g_return_if_fail (destination_file_name != NULL);
-	
+
+	metafile = get_metafile (source_directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return;
+	}
+
 	destination_uri = nautilus_directory_get_uri (destination_directory);
 
 	CORBA_exception_init (&ev);
 
-	Nautilus_Metafile_copy (get_metafile (source_directory), source_file_name,
+	Nautilus_Metafile_copy (metafile, source_file_name,
 				destination_uri, destination_file_name, &ev);
 
 	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
@@ -462,13 +501,20 @@ nautilus_directory_remove_file_metadata (NautilusDirectory *directory,
 					 const char *file_name)
 {
 	CORBA_Environment ev;
+	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (file_name != NULL);
-	
+
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return;
+	}
+
 	CORBA_exception_init (&ev);
 
-	Nautilus_Metafile_remove (get_metafile (directory), file_name, &ev);
+	Nautilus_Metafile_remove (metafile, file_name, &ev);
 
 	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
@@ -480,14 +526,21 @@ nautilus_directory_rename_file_metadata (NautilusDirectory *directory,
 					 const char *new_file_name)
 {
 	CORBA_Environment ev;
+	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (old_file_name != NULL);
 	g_return_if_fail (new_file_name != NULL);
-	
+
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return;
+	}
+
 	CORBA_exception_init (&ev);
 
-	Nautilus_Metafile_rename (get_metafile (directory), old_file_name, new_file_name, &ev);
+	Nautilus_Metafile_rename (metafile, old_file_name, new_file_name, &ev);
 
 	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
@@ -498,13 +551,20 @@ nautilus_directory_rename_directory_metadata (NautilusDirectory *directory,
 					      const char *new_directory_uri)
 {
 	CORBA_Environment ev;
+	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (new_directory_uri != NULL);
-	
+
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return;
+	}
+
 	CORBA_exception_init (&ev);
 
-	Nautilus_Metafile_rename_directory (get_metafile (directory), new_directory_uri, &ev);
+	Nautilus_Metafile_rename_directory (metafile, new_directory_uri, &ev);
 
 	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
@@ -514,6 +574,7 @@ void
 nautilus_directory_register_metadata_monitor (NautilusDirectory *directory)
 {
 	CORBA_Environment ev;
+	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 
@@ -522,12 +583,18 @@ nautilus_directory_register_metadata_monitor (NautilusDirectory *directory)
 		return;
 	}
 	
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return;
+	}
+
 	directory->details->metafile_monitor = nautilus_metafile_monitor_new (directory);
 
 	CORBA_exception_init (&ev);
 
 	Nautilus_Metafile_register_monitor
-		(get_metafile (directory),
+		(metafile,
 		 BONOBO_OBJREF (directory->details->metafile_monitor),
 		 &ev);
 
@@ -539,14 +606,21 @@ void
 nautilus_directory_unregister_metadata_monitor (NautilusDirectory *directory)
 {
 	CORBA_Environment ev;
+	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));	
 	g_return_if_fail (NAUTILUS_IS_METAFILE_MONITOR (directory->details->metafile_monitor));
 
+	metafile = get_metafile (directory);
+
+	if (metafile == CORBA_OBJECT_NIL) {
+		return;
+	}
+
 	CORBA_exception_init (&ev);
 
 	Nautilus_Metafile_unregister_monitor
-		(get_metafile (directory),
+		(metafile,
 		 BONOBO_OBJREF (directory->details->metafile_monitor),
 		 &ev);
 
diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h
index 4c0cf4e0c..930084f93 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -192,7 +192,8 @@ void               nautilus_directory_emit_change_signals             (NautilusD
 void               emit_change_signals_for_all_files		      (NautilusDirectory	 *directory);
 void               nautilus_directory_emit_done_loading               (NautilusDirectory         *directory);
 void               nautilus_directory_emit_load_error                 (NautilusDirectory         *directory,
-								       GnomeVFSResult             error_result);
+								       GnomeVFSResult             error_result,
+								       const char                *error_message);
 NautilusDirectory *nautilus_directory_get_internal                    (const char                *uri,
 								       gboolean                   create);
 char *             nautilus_directory_get_name_for_self_as_new_file   (NautilusDirectory         *directory);
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 4831480f5..7f7848999 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -30,8 +30,10 @@
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-private.h"
 #include "nautilus-file-utilities.h"
+#include "nautilus-search-directory.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-lib-self-check-functions.h"
+#include "nautilus-marshal.h"
 #include "nautilus-metadata.h"
 #include "nautilus-metafile.h"
 #include "nautilus-desktop-directory.h"
@@ -71,6 +73,7 @@ static void               nautilus_directory_class_init (NautilusDirectoryClass
 static NautilusDirectory *nautilus_directory_new              (const char             *uri);
 static char *             real_get_name_for_self_as_new_file  (NautilusDirectory      *directory);
 static GList *            real_get_file_list                  (NautilusDirectory      *directory);
+static gboolean		  real_is_editable                    (NautilusDirectory      *directory);
 static void               set_directory_uri                   (NautilusDirectory      *directory,
 							       const char             *new_uri);
 
@@ -117,11 +120,12 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusDirectoryClass, load_error),
 		              NULL, NULL,
-		              g_cclosure_marshal_VOID__INT,
-		              G_TYPE_NONE, 1, G_TYPE_INT);
+		              nautilus_marshal_VOID__INT_STRING,
+		              G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING);
 
 	klass->get_name_for_self_as_new_file = real_get_name_for_self_as_new_file;
 	klass->get_file_list = real_get_file_list;
+	klass->is_editable = real_is_editable;
 
 	g_type_class_add_private (klass, sizeof (NautilusDirectoryDetails));
 }
@@ -515,6 +519,8 @@ nautilus_directory_new (const char *uri)
 		directory = NAUTILUS_DIRECTORY (g_object_new (NAUTILUS_TYPE_TRASH_DIRECTORY, NULL));
 	} else if (eel_uri_is_desktop (uri)) {
 		directory = NAUTILUS_DIRECTORY (g_object_new (NAUTILUS_TYPE_DESKTOP_DIRECTORY, NULL));
+	} else if (eel_uri_is_search (uri)) {
+		directory = NAUTILUS_DIRECTORY (g_object_new (NAUTILUS_TYPE_SEARCH_DIRECTORY, NULL));		
 	} else {
 		directory = NAUTILUS_DIRECTORY (g_object_new (NAUTILUS_TYPE_VFS_DIRECTORY, NULL));
 	}
@@ -764,11 +770,12 @@ nautilus_directory_emit_done_loading (NautilusDirectory *directory)
 
 void
 nautilus_directory_emit_load_error (NautilusDirectory *directory,
-				    GnomeVFSResult error_result)
+				    GnomeVFSResult error_result,
+				    const char *error_message)
 {
 	g_signal_emit (directory,
 			 signals[LOAD_ERROR], 0,
-			 error_result);
+			 error_result, error_message);
 }
 
 
@@ -1652,6 +1659,20 @@ real_get_file_list (NautilusDirectory *directory)
 	return non_tentative_files;
 }
 
+static gboolean
+real_is_editable (NautilusDirectory *directory)
+{
+	return TRUE;
+}
+
+gboolean
+nautilus_directory_is_editable (NautilusDirectory *directory)
+{
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
+		(NAUTILUS_DIRECTORY_CLASS, directory, 
+		 is_editable, (directory));
+}
+
 GList *
 nautilus_directory_match_pattern (NautilusDirectory *directory, const char *pattern)
 {
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index c708daaaa..6766e67f6 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -100,7 +100,9 @@ typedef struct
 	 */
 	void     (* done_loading)        (NautilusDirectory         *directory);
 
-	void     (* load_error)          (NautilusDirectory         *directory);
+	void     (* load_error)          (NautilusDirectory         *directory,
+					  GnomeVFSResult             error_result,
+					  const char                *error_message);
 
 	/*** Virtual functions for subclasses to override. ***/
 	gboolean (* contains_file)       (NautilusDirectory         *directory,
@@ -134,6 +136,12 @@ typedef struct
 	 * the list of standard icons (Computer, Home, Trash) on the desktop.
 	 */
 	GList *	 (* get_file_list)	 (NautilusDirectory *directory);
+
+	/* Should return FALSE if the directory is read-only and doesn't
+	 * allow setting of metadata.
+	 * An example of this is the search directory.
+	 */
+	gboolean (* is_editable)         (NautilusDirectory *directory);
 } NautilusDirectoryClass;
 
 /* Basic GObject requirements. */
@@ -227,5 +235,7 @@ GList *            nautilus_directory_list_sort_by_uri         (GList
 /* Fast way to check if a directory is the desktop directory */
 gboolean           nautilus_directory_is_desktop_directory     (NautilusDirectory         *directory);
 
+gboolean           nautilus_directory_is_editable              (NautilusDirectory         *directory);
+
 
 #endif /* NAUTILUS_DIRECTORY_H */
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index c2e58a8cf..372ff909b 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1859,15 +1859,8 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 		target_uri = NULL;
 		if (target_dir != NULL) {
 			if (target_is_trash) {
-				result = gnome_vfs_find_directory (source_uri, GNOME_VFS_DIRECTORY_KIND_TRASH,
-								   &target_dir_uri, FALSE, FALSE, 0777);
-				if (result == GNOME_VFS_ERROR_NOT_FOUND && source_dir_uri != NULL) {
-					/* source_uri may be a broken symlink */
-					result = gnome_vfs_find_directory (source_dir_uri, GNOME_VFS_DIRECTORY_KIND_TRASH,
-									   &target_dir_uri, FALSE, FALSE, 0777);
-				}
-
-				result = GNOME_VFS_OK;
+				gnome_vfs_find_directory (source_uri, GNOME_VFS_DIRECTORY_KIND_TRASH,
+							  &target_dir_uri, FALSE, FALSE, 0777);			
 			}
 			if (target_dir_uri != NULL) {
 				target_uri = append_basename (target_dir_uri, source_uri);
@@ -2719,8 +2712,6 @@ nautilus_file_operations_empty_trash (GtkWidget *parent_view)
 void
 nautilus_self_check_file_operations (void)
 {
-	setlocale (LC_MESSAGES, "C");
-
 	/* test the next duplicate name generator */
 	EEL_CHECK_STRING_RESULT (get_duplicate_name (" (copy)", 1), " (another copy)");
 	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo", 1), "foo (copy)");
@@ -2763,8 +2754,6 @@ nautilus_self_check_file_operations (void)
 	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (122nd copy).txt", 1), "foo (123rd copy).txt");
 	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (123rd copy)", 1), "foo (124th copy)");
 	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (123rd copy).txt", 1), "foo (124th copy).txt");
-
-	setlocale (LC_MESSAGES, "");
 }
 
 #endif
diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h
index 24466f8ab..7c28be9e1 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/libnautilus-private/nautilus-file-private.h
@@ -65,6 +65,8 @@ struct NautilusFileDetails
 	GnomeVFSFileInfo *info;
 	GnomeVFSResult get_info_error;
 
+	NautilusMonitor *monitor;
+	
 	guint directory_count;
 
 	guint deep_directory_count;
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index d5fc80833..6cb00bf79 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -30,6 +30,7 @@
 #include "nautilus-metadata.h"
 #include "nautilus-metafile.h"
 #include "nautilus-file.h"
+#include "nautilus-search-directory.h"
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
@@ -56,10 +57,21 @@ nautilus_compute_title_for_uri (const char *text_uri)
 	GnomeVFSURI *uri;
 	char *title, *displayname;
 	const char *hostname;
-
+	NautilusDirectory *directory;
+	NautilusQuery *query;
 	hostname = NULL;
 
 	if (text_uri) {
+		if (eel_uri_is_search (text_uri)) {
+			directory = nautilus_directory_get (text_uri);
+			
+			query = nautilus_search_directory_get_query (NAUTILUS_SEARCH_DIRECTORY (directory));
+			title = nautilus_query_to_readable_string (query);
+
+			nautilus_directory_unref (directory);
+
+			return title;
+		}
 		file = nautilus_file_get (text_uri);
 		uri = gnome_vfs_uri_new (text_uri);
 		if (uri && !gnome_vfs_uri_is_local (uri)) {
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index d0676c295..eb1ba85d1 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -40,6 +40,8 @@
 #include "nautilus-link-desktop-file.h"
 #include "nautilus-metadata.h"
 #include "nautilus-module.h"
+#include "nautilus-search-directory.h"
+#include "nautilus-search-directory-file.h"
 #include "nautilus-thumbnails.h"
 #include "nautilus-trash-directory.h"
 #include "nautilus-trash-file.h"
@@ -72,12 +74,11 @@
 /* Time in seconds to cache getpwuid results */
 #define GETPWUID_CACHE_TIME (5*60)
 
+
 #undef NAUTILUS_FILE_DEBUG_REF
 
 #ifdef NAUTILUS_FILE_DEBUG_REF
-extern void eazel_dump_stack_trace	(const char    *print_prefix,
-					 int		num_levels);
-/* from libleakcheck.so */
+#include <valgrind/valgrind.h>
 #endif
 
 /* Files that start with these characters sort after files that don't. */
@@ -195,20 +196,27 @@ nautilus_file_new_from_relative_uri (NautilusDirectory *directory,
 			file = NULL;
 			g_assert_not_reached ();
 		}
+	} else if (NAUTILUS_IS_SEARCH_DIRECTORY (directory)) {
+		if (self_owned) {
+			file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_SEARCH_DIRECTORY_FILE, NULL));
+		} else {
+			file = NULL;
+			g_assert_not_reached ();
+		}
 	} else {
 		file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
 	}
 
-#ifdef NAUTILUS_FILE_DEBUG_REF
-	printf("%10p ref'd\n", file);
-	eazel_dump_stack_trace ("\t", 10);
-#endif
-
 	nautilus_directory_ref (directory);
 	file->details->directory = directory;
 
 	file->details->relative_uri = g_strdup (relative_uri);
 
+#ifdef NAUTILUS_FILE_DEBUG_REF
+	if (strcmp (nautilus_file_get_uri (file), "file:///home/andersca/src/gnome/gtk%2B/gtk/gtkbutton.c") == 0)
+	VALGRIND_PRINTF_BACKTRACE("%10p ref'd", file);
+#endif
+
 	return file;
 }
 
@@ -307,15 +315,17 @@ nautilus_file_new_from_info (NautilusDirectory *directory,
 
 	file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
 
-#ifdef NAUTILUS_FILE_DEBUG_REF
-	printf("%10p ref'd\n", file);
-	eazel_dump_stack_trace ("\t", 10);
-#endif
-
 	nautilus_directory_ref (directory);
 	file->details->directory = directory;
 
 	update_info_and_name (file, info, FALSE);
+
+
+#ifdef NAUTILUS_FILE_DEBUG_REF
+	if (strcmp (nautilus_file_get_uri (file), "file:///home/andersca/src/gnome/gtk%2B/gtk/gtkbutton.c") == 0)
+	VALGRIND_PRINTF_BACKTRACE("%10p ref'd", file);
+#endif
+
 	return file;
 }
 
@@ -404,6 +414,13 @@ nautilus_file_get_internal (const char *uri, gboolean create)
 				relative_uri_tmp++;
 			}
 			relative_uri = strdup (relative_uri_tmp);
+		} else if (eel_uri_is_search (uri)) {
+			/* Special case search files as well. */
+			relative_uri_tmp = uri + strlen (EEL_SEARCH_URI);
+			while (*relative_uri_tmp == '/') {
+				relative_uri_tmp++;
+			}
+			relative_uri = strdup (relative_uri_tmp);
 		}
 	}
 
@@ -471,6 +488,10 @@ finalize (GObject *object)
 		g_free (uri);
 	}
 	
+	if (file->details->monitor != NULL) {
+		nautilus_monitor_cancel (file->details->monitor);
+	}
+
 	nautilus_async_destroying_file (file);
 
 	remove_from_link_hash_table (file);
@@ -524,8 +545,8 @@ nautilus_file_ref (NautilusFile *file)
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
 
 #ifdef NAUTILUS_FILE_DEBUG_REF
-	printf("%10p ref'd\n", file);
-	eazel_dump_stack_trace ("\t", 10);
+	if (strcmp (nautilus_file_get_uri (file), "file:///home/andersca/src/gnome/gtk%2B/gtk/gtkbutton.c") == 0)
+	VALGRIND_PRINTF_BACKTRACE("%10p ref'd", file);
 #endif
 
 	g_object_ref (file);
@@ -542,8 +563,8 @@ nautilus_file_unref (NautilusFile *file)
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 
 #ifdef NAUTILUS_FILE_DEBUG_REF
-	printf("%10p unref'd\n", file);
-	eazel_dump_stack_trace ("\t", 10);
+	if (strcmp (nautilus_file_get_uri (file), "file:///home/andersca/src/gnome/gtk%2B/gtk/gtkbutton.c") == 0)
+	VALGRIND_PRINTF_BACKTRACE("%10p unref'd", file);
 #endif
 
 	g_object_unref (file);
@@ -3285,9 +3306,6 @@ nautilus_file_get_directory_item_count (NautilusFile *file,
  * @unreadable_directory_count: Number of directories encountered
  * that were unreadable.
  * @total_size: Total size of all files and directories visited.
- * @force: Whether the deep counts should even be collected if
- * nautilus_file_should_show_directory_item_count returns FALSE
- * for this file.
  * 
  * Returns: Status to indicate whether sizes are available.
  * 
@@ -3297,8 +3315,7 @@ nautilus_file_get_deep_counts (NautilusFile *file,
 			       guint *directory_count,
 			       guint *file_count,
 			       guint *unreadable_directory_count,
-			       GnomeVFSFileSize *total_size,
-			       gboolean force)
+			       GnomeVFSFileSize *total_size)
 {
 	if (directory_count != NULL) {
 		*directory_count = 0;
@@ -3315,7 +3332,7 @@ nautilus_file_get_deep_counts (NautilusFile *file,
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), NAUTILUS_REQUEST_DONE);
 
-	if (!force && !nautilus_file_should_show_directory_item_count (file)) {
+	if (!nautilus_file_should_show_directory_item_count (file)) {
 		/* Set field so an existing value isn't treated as up-to-date
 		 * when preference changes later.
 		 */
@@ -4361,7 +4378,7 @@ nautilus_file_get_deep_count_as_string_internal (NautilusFile *file,
 	g_return_val_if_fail (nautilus_file_is_directory (file), NULL);
 
 	status = nautilus_file_get_deep_counts 
-		(file, &directory_count, &file_count, &unreadable_count, &total_size, FALSE);
+		(file, &directory_count, &file_count, &unreadable_count, &total_size);
 
 	/* Check whether any info is available. */
 	if (status == NAUTILUS_REQUEST_NOT_STARTED) {
@@ -4625,7 +4642,7 @@ nautilus_file_get_string_attribute_with_default (NautilusFile *file, const char
 		return g_strdup (count_unreadable ? _("? items") : "...");
 	}
 	if (strcmp (attribute_name, "deep_size") == 0) {
-		status = nautilus_file_get_deep_counts (file, NULL, NULL, NULL, NULL, FALSE);
+		status = nautilus_file_get_deep_counts (file, NULL, NULL, NULL, NULL);
 		if (status == NAUTILUS_REQUEST_DONE) {
 			/* This means no contents at all were readable */
 			return g_strdup (_("? bytes"));
@@ -4635,7 +4652,7 @@ nautilus_file_get_string_attribute_with_default (NautilusFile *file, const char
 	if (strcmp (attribute_name, "deep_file_count") == 0
 	    || strcmp (attribute_name, "deep_directory_count") == 0
 	    || strcmp (attribute_name, "deep_total_count") == 0) {
-		status = nautilus_file_get_deep_counts (file, NULL, NULL, NULL, NULL, FALSE);
+		status = nautilus_file_get_deep_counts (file, NULL, NULL, NULL, NULL);
 		if (status == NAUTILUS_REQUEST_DONE) {
 			/* This means no contents at all were readable */
 			return g_strdup (_("? items"));
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index 187748b95..dcaf53fee 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -164,8 +164,7 @@ NautilusRequestStatus   nautilus_file_get_deep_counts                   (Nautilu
 									 guint                          *directory_count,
 									 guint                          *file_count,
 									 guint                          *unreadable_directory_count,
-									 GnomeVFSFileSize               *total_size,
-									 gboolean                        force);
+									 GnomeVFSFileSize               *total_size);
 gboolean                nautilus_file_should_show_directory_item_count  (NautilusFile                   *file);
 GList *                 nautilus_file_get_keywords                      (NautilusFile                   *file);
 void                    nautilus_file_set_keywords                      (NautilusFile                   *file,
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index e12929a80..ae459df3a 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -3589,6 +3589,7 @@ motion_notify_event (GtkWidget *widget,
 	NautilusIconContainerDetails *details;
 	double world_x, world_y;
 	int canvas_x, canvas_y;
+	GdkDragAction actions;
 
 	container = NAUTILUS_ICON_CONTAINER (widget);
 	details = container->details;
@@ -3621,13 +3622,16 @@ motion_notify_event (GtkWidget *widget,
 						  &canvas_x,
 						  &canvas_y);
 
+				actions = GDK_ACTION_COPY
+					| GDK_ACTION_LINK
+					| GDK_ACTION_ASK;
+
+				if (container->details->drag_allow_moves) {
+					actions |= GDK_ACTION_MOVE;
+				}
+
 				nautilus_icon_dnd_begin_drag (container,
-							      details->drag_state == DRAG_STATE_MOVE_OR_COPY
-							      ? (GDK_ACTION_MOVE 
-								 | GDK_ACTION_COPY 
-								 | GDK_ACTION_LINK
-								 | GDK_ACTION_ASK)
-							      : GDK_ACTION_ASK,
+							      actions,
 							      details->drag_button,
 							      event, 
 							      canvas_x,
@@ -5169,7 +5173,7 @@ finish_adding_icon (NautilusIconContainer *container,
 static void
 finish_adding_new_icons (NautilusIconContainer *container)
 {
-	GList *p, *new_icons, *no_position_icons, *semi_position_icons;
+	GList *p, *new_icons, *no_position_icons;
 	NautilusIcon *icon;
 	double bottom;
 
@@ -5178,61 +5182,16 @@ finish_adding_new_icons (NautilusIconContainer *container)
 
 	/* Position most icons (not unpositioned manual-layout icons). */
 	new_icons = g_list_reverse (new_icons);
-	no_position_icons = semi_position_icons = NULL;
+	no_position_icons = NULL;
 	for (p = new_icons; p != NULL; p = p->next) {
 		icon = p->data;
 		if (!assign_icon_position (container, icon)) {
 			no_position_icons = g_list_prepend (no_position_icons, icon);
-		} else if (!container->details->auto_layout &&
-			   icon->has_lazy_position) {
-			semi_position_icons = g_list_prepend (semi_position_icons, icon);
 		}
 		finish_adding_icon (container, icon);
 	}
 	g_list_free (new_icons);
 
-	if (semi_position_icons != NULL) {
-		PlacementGrid *grid;
-
-		g_assert (!container->details->auto_layout);
-
-		semi_position_icons = g_list_reverse (semi_position_icons);
-
-		grid = placement_grid_new (container, TRUE);
-
-		for (p = container->details->icons; p != NULL; p = p->next) {
-			icon = p->data;
-
-			if (icon_is_positioned (icon) && !icon->has_lazy_position) {
-				placement_grid_mark_icon (grid, icon);
-			}
-		}
-
-		for (p = semi_position_icons; p != NULL; p = p->next) {
-			NautilusIcon *icon;
-			int x, y;
-
-			icon = p->data;
-			x = icon->x;
-			y = icon->y;
-
-			find_empty_location (container, grid, 
-					     icon, x, y, &x, &y);
-
-			icon_set_position (icon, x, y);
-
-			placement_grid_mark_icon (grid, icon);
-
-			/* ensure that next time we run this code, the formerly semi-positioned
-			 * icons are treated as being positioned. */
-			icon->has_lazy_position = FALSE;
-		}
-
-		placement_grid_free (grid);
-
-		g_list_free (semi_position_icons);
-	}
-
 	/* Position the unpositioned manual layout icons. */
 	if (no_position_icons != NULL) {
 		g_assert (!container->details->auto_layout);
@@ -5248,18 +5207,13 @@ finish_adding_new_icons (NautilusIconContainer *container)
  * nautilus_icon_container_add:
  * @container: A NautilusIconContainer
  * @data: Icon data.
- * @has_lazy_position: Whether the saved icon position should only be used
- * 		       if the previous icon position is free. If the position
- * 		       is occupied, another position near the last one will
- * 		       be used.
  * 
  * Add icon to represent @data to container.
  * Returns FALSE if there was already such an icon.
  **/
 gboolean
 nautilus_icon_container_add (NautilusIconContainer *container,
-			     NautilusIconData *data,
-			     gboolean has_lazy_position)
+			     NautilusIconData *data)
 {
 	NautilusIconContainerDetails *details;
 	NautilusIcon *icon;
@@ -5279,7 +5233,6 @@ nautilus_icon_container_add (NautilusIconContainer *container,
 	icon->data = data;
 	icon->x = ICON_UNPOSITIONED_VALUE;
 	icon->y = ICON_UNPOSITIONED_VALUE;
-	icon->has_lazy_position = has_lazy_position;
 	icon->scale_x = 1.0;
 	icon->scale_y = 1.0;
  	icon->item = NAUTILUS_ICON_CANVAS_ITEM
@@ -6769,6 +6722,23 @@ nautilus_icon_container_get_icon_description (NautilusIconContainer *container,
 	}
 }
 
+gboolean
+nautilus_icon_container_get_allow_moves (NautilusIconContainer *container)
+{
+	g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), FALSE);
+
+	return container->details->drag_allow_moves;
+}
+
+void
+nautilus_icon_container_set_allow_moves	(NautilusIconContainer *container,
+					 gboolean               allow_moves)
+{
+	g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
+
+	container->details->drag_allow_moves = allow_moves;
+}
+
 /* NautilusIconContainerAccessible */
 
 static NautilusIconContainerAccessiblePrivate *
diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h
index fafd1cde3..2e41293b8 100644
--- a/libnautilus-private/nautilus-icon-container.h
+++ b/libnautilus-private/nautilus-icon-container.h
@@ -204,8 +204,7 @@ GtkWidget *       nautilus_icon_container_new                           (void);
 /* adding, removing, and managing icons */
 void              nautilus_icon_container_clear                         (NautilusIconContainer  *view);
 gboolean          nautilus_icon_container_add                           (NautilusIconContainer  *view,
-									 NautilusIconData       *data,
-									 gboolean                has_lazy_position);
+									 NautilusIconData       *data);
 void              nautilus_icon_container_layout_now                    (NautilusIconContainer *container);
 gboolean          nautilus_icon_container_remove                        (NautilusIconContainer  *view,
 									 NautilusIconData       *data);
@@ -286,5 +285,8 @@ void              nautilus_icon_container_set_use_drop_shadows          (Nautilu
 									 gboolean                use_drop_shadows);
 char*             nautilus_icon_container_get_icon_description          (NautilusIconContainer  *container,
                                                                          NautilusIconData       *data);
+gboolean          nautilus_icon_container_get_allow_moves               (NautilusIconContainer  *container);
+void              nautilus_icon_container_set_allow_moves               (NautilusIconContainer  *container,
+									 gboolean                allow_moves);
 
 #endif /* NAUTILUS_ICON_CONTAINER_H */
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index c7bd5cc53..41bac18ab 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -844,8 +844,7 @@ handle_local_move (NautilusIconContainer *container,
 			g_free (screen_string);
 
 			nautilus_icon_container_add (container,
-					NAUTILUS_ICON_CONTAINER_ICON_DATA (file),
-					FALSE);
+					NAUTILUS_ICON_CONTAINER_ICON_DATA (file));
 			
 			icon = nautilus_icon_container_get_icon_by_uri
 				(container, item->uri);
diff --git a/libnautilus-private/nautilus-icon-private.h b/libnautilus-private/nautilus-icon-private.h
index fbf4030e4..ec2d4414a 100644
--- a/libnautilus-private/nautilus-icon-private.h
+++ b/libnautilus-private/nautilus-icon-private.h
@@ -57,7 +57,6 @@ typedef struct {
 	/* Whether a monitor was set on this icon. */
 	eel_boolean_bit is_monitored : 1;
 
-	eel_boolean_bit has_lazy_position : 1;
 } NautilusIcon;
 
 
@@ -161,6 +160,7 @@ struct NautilusIconContainerDetails {
 	gboolean drag_started;
 	StretchState stretch_start;
 	int context_menu_timeout_id;
+	gboolean drag_allow_moves;
 
 	gboolean icon_selected_on_button_down;
 	NautilusIcon *double_click_icon[2]; /* Both clicks in a double click need to be on the same icon */
diff --git a/libnautilus-private/nautilus-marshal.list b/libnautilus-private/nautilus-marshal.list
index 06d931b3c..30c142da1 100644
--- a/libnautilus-private/nautilus-marshal.list
+++ b/libnautilus-private/nautilus-marshal.list
@@ -14,3 +14,4 @@ VOID:POINTER,STRING,ENUM,INT,INT
 VOID:STRING,STRING
 VOID:POINTER,POINTER,POINTER,ENUM,INT,INT
 VOID:POINTER,ENUM
+VOID:INT,STRING
diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c
index 80016772a..ffb366a5a 100644
--- a/libnautilus-private/nautilus-merged-directory.c
+++ b/libnautilus-private/nautilus-merged-directory.c
@@ -27,7 +27,6 @@
 #include "nautilus-merged-directory.h"
 
 #include "nautilus-directory-private.h"
-#include "nautilus-directory-notify.h"
 #include "nautilus-file.h"
 #include <eel/eel-glib-extensions.h>
 #include <gtk/gtksignal.h>
@@ -541,31 +540,6 @@ monitor_remove_directory (gpointer key,
 }
 
 static void
-real_directory_notify_files_removed (NautilusDirectory *real_directory)
-{
-	GList *files, *l;
-
-	files = nautilus_directory_get_file_list (real_directory);
-
-	for (l = files; l; l = l->next) {
-		NautilusFile *file;
-		char *uri;
-
-		file = NAUTILUS_FILE (l->data);
-		uri = nautilus_file_get_uri (file);
-		nautilus_file_unref (file);
-
-		l->data = uri;
-	}
-
-	if (files) {
-		nautilus_directory_notify_files_removed (files);
-	}
-
-	eel_g_list_free_deep (files);
-}
-
-static void
 merged_remove_real_directory (NautilusMergedDirectory *merged,
 			      NautilusDirectory *real_directory)
 {
@@ -573,9 +547,6 @@ merged_remove_real_directory (NautilusMergedDirectory *merged,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (real_directory));
 	g_return_if_fail (g_list_find (merged->details->directories, real_directory) != NULL);
 
-	/* Since the real directory will be going away, act as if files were removed */
-	real_directory_notify_files_removed (real_directory);
-
 	/* Remove this directory from callbacks and monitors. */
 	eel_g_hash_table_safe_for_each (merged->details->callbacks,
 					merged_callback_remove_directory_cover,
diff --git a/libnautilus-private/nautilus-metafile-factory.c b/libnautilus-private/nautilus-metafile-factory.c
index eadd69336..c939b440b 100644
--- a/libnautilus-private/nautilus-metafile-factory.c
+++ b/libnautilus-private/nautilus-metafile-factory.c
@@ -54,6 +54,10 @@ corba_open (PortableServer_Servant servant,
 
 	metafile = nautilus_metafile_get (directory);
 
+	if (!metafile) {
+		return CORBA_OBJECT_NIL;
+	}
+
 	return CORBA_Object_duplicate (BONOBO_OBJREF (metafile), ev);
 }
 
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index fc64b26a7..9617e8823 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -232,7 +232,12 @@ nautilus_metafile_get (const char *directory_uri)
 	char *canonical_uri;
 	
 	g_return_val_if_fail (directory_uri != NULL, NULL);
-	
+
+	/* We don't have metafiles for search uris */
+	if (eel_uri_is_search (directory_uri)) {
+		return NULL;
+	}
+
 	if (metafiles == NULL) {
 		metafiles = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal, __FILE__ ": metafiles");
@@ -1414,8 +1419,6 @@ copy_file_metadata (NautilusMetafile *source_metafile,
 {
 	xmlNodePtr source_node, node, root;
 	GHashTable *hash, *changes;
-	char *source_file_uri;
-	char *destination_file_uri;
 
 	g_return_if_fail (NAUTILUS_IS_METAFILE (source_metafile));
 	g_return_if_fail (source_file_name != NULL);
@@ -1459,12 +1462,9 @@ copy_file_metadata (NautilusMetafile *source_metafile,
 		}
 	}
 
-	/* Copy the thumbnail for the file, if any. */
-	source_file_uri = metafile_get_file_uri (source_metafile, source_file_name);
-	destination_file_uri = metafile_get_file_uri (destination_metafile, destination_file_name);
-	nautilus_update_thumbnail_file_copied (source_file_uri, destination_file_uri);
-	g_free (source_file_uri);
-	g_free (destination_file_uri);
+	/* FIXME: Do we want to copy the thumbnail here like in the
+	 * rename and remove cases?
+	 */
 }
 
 static void
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index da66ce6a6..9abf38d58 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -103,12 +103,15 @@ monitor_notify_cb (GnomeVFSMonitorHandle    *handle,
 {
 	switch (event_type) {
 	case GNOME_VFS_MONITOR_EVENT_CHANGED:
+		printf ("queuing change: %s\n", info_uri);
 		nautilus_file_changes_queue_file_changed (info_uri);
 		break;
 	case GNOME_VFS_MONITOR_EVENT_DELETED:
+		printf ("queuing delete: %s\n", info_uri);
 		nautilus_file_changes_queue_file_removed (info_uri);
 		break;
 	case GNOME_VFS_MONITOR_EVENT_CREATED:
+		printf ("queuing create: %s\n", info_uri);
 		nautilus_file_changes_queue_file_added (info_uri);
 		break;
 
diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c
new file mode 100644
index 000000000..f54883a7c
--- /dev/null
+++ b/libnautilus-private/nautilus-query.c
@@ -0,0 +1,101 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Anders Carlsson <andersca@imendio.com>
+ *
+ */
+
+#include <config.h>
+#include "nautilus-query.h"
+
+#include <eel/eel-gtk-macros.h>
+
+struct NautilusQueryDetails {
+	char *text;
+};
+
+static void  nautilus_query_class_init       (NautilusQueryClass *class);
+static void  nautilus_query_init             (NautilusQuery      *query);
+
+G_DEFINE_TYPE (NautilusQuery,
+	       nautilus_query,
+	       G_TYPE_OBJECT);
+
+static GObjectClass *parent_class = NULL;
+
+static void
+finalize (GObject *object)
+{
+	NautilusQuery *query;
+
+	query = NAUTILUS_QUERY (object);
+	
+	g_free (query->details->text);
+	g_free (query->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+static void
+nautilus_query_class_init (NautilusQueryClass *class)
+{
+	GObjectClass *gobject_class;
+
+	parent_class = g_type_class_peek_parent (class);
+
+	gobject_class = G_OBJECT_CLASS (class);
+	gobject_class->finalize = finalize;
+}
+
+static void
+nautilus_query_init (NautilusQuery *query)
+{
+	query->details = g_new0 (NautilusQueryDetails, 1);
+}
+
+NautilusQuery *
+nautilus_query_new (void)
+{
+	return g_object_new (NAUTILUS_TYPE_QUERY,  NULL);
+}
+
+
+G_CONST_RETURN char *
+nautilus_query_get_text (NautilusQuery *query)
+{
+	return query->details->text;
+}
+
+void 
+nautilus_query_set_text (NautilusQuery *query, const char *text)
+{
+	g_free (query->details->text);
+	query->details->text = g_strdup (text);
+}
+
+char *
+nautilus_query_to_readable_string (NautilusQuery *query)
+{
+	if (!query || !query->details->text) {
+		return g_strdup ("Search");
+	}
+
+	return g_strdup_printf ("Search for \"%s\"", query->details->text);
+}
+
diff --git a/libnautilus-private/nautilus-query.h b/libnautilus-private/nautilus-query.h
new file mode 100644
index 000000000..87033bf2f
--- /dev/null
+++ b/libnautilus-private/nautilus-query.h
@@ -0,0 +1,58 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Anders Carlsson <andersca@imendio.com>
+ *
+ */
+
+#ifndef NAUTILUS_QUERY_H
+#define NAUTILUS_QUERY_H
+
+#include <glib-object.h>
+#include <libgnomevfs/gnome-vfs-result.h>
+
+#define NAUTILUS_TYPE_QUERY		(nautilus_query_get_type ())
+#define NAUTILUS_QUERY(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_QUERY, NautilusQuery))
+#define NAUTILUS_QUERY_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_QUERY, NautilusQueryClass))
+#define NAUTILUS_IS_QUERY(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_QUERY))
+#define NAUTILUS_IS_QUERY_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_QUERY))
+#define NAUTILUS_QUERY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_QUERY, NautilusQueryClass))
+
+typedef struct NautilusQueryDetails NautilusQueryDetails;
+
+typedef struct NautilusQuery {
+	GObject parent;
+	NautilusQueryDetails *details;
+} NautilusQuery;
+
+typedef struct {
+	GObjectClass parent_class;
+} NautilusQueryClass;
+
+GType          nautilus_query_get_type (void);
+gboolean       nautilus_query_enabled  (void);
+
+NautilusQuery* nautilus_query_new      (void);
+
+G_CONST_RETURN char *nautilus_query_get_text (NautilusQuery *query);
+void nautilus_query_set_text (NautilusQuery *query, const char *text);
+
+char *nautilus_query_to_readable_string (NautilusQuery *query);
+
+#endif /* NAUTILUS_QUERY_H */
diff --git a/libnautilus-private/nautilus-search-directory-file.c b/libnautilus-private/nautilus-search-directory-file.c
new file mode 100644
index 000000000..03afd17f5
--- /dev/null
+++ b/libnautilus-private/nautilus-search-directory-file.c
@@ -0,0 +1,135 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   nautilus-search-directory-file.c: Subclass of NautilusFile to help implement the
+   searches
+ 
+   Copyright (C) 2005 Novell, 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: Anders Carlsson <andersca@imendio.com>
+*/
+
+#include <config.h>
+#include "nautilus-search-directory-file.h"
+
+#include "nautilus-directory-notify.h"
+#include "nautilus-directory-private.h"
+#include "nautilus-file-attributes.h"
+#include "nautilus-file-private.h"
+#include "nautilus-file-utilities.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include "nautilus-search-directory.h"
+#include <gtk/gtksignal.h>
+#include <libgnome/gnome-i18n.h>
+#include <string.h>
+
+static void nautilus_search_directory_file_init       (gpointer   object,
+						  gpointer   klass);
+static void nautilus_search_directory_file_class_init (gpointer   klass);
+
+EEL_CLASS_BOILERPLATE (NautilusSearchDirectoryFile,
+		       nautilus_search_directory_file,
+		       NAUTILUS_TYPE_FILE);
+
+struct NautilusSearchDirectoryFileDetails {
+	gint foo;
+};
+
+static void
+search_directory_file_call_when_ready (NautilusFile *file,
+				       NautilusFileAttributes file_attributes,
+				       NautilusFileCallback callback,
+				       gpointer callback_data)
+
+{
+#if 0
+	g_print ("call when ready: %d\n", file_attributes);
+
+#endif
+	/* We can just call this immediately */
+	/* FIXME: We can't do that for everything */
+	callback (file, callback_data);
+}
+ 
+static void
+search_directory_file_cancel_call_when_ready (NautilusFile *file,
+					       NautilusFileCallback callback,
+					       gpointer callback_data)
+{
+	/* Do nothing here, we don't have any pending calls */
+}
+
+
+static gboolean
+search_directory_file_check_if_ready (NautilusFile *file,
+				      NautilusFileAttributes attributes)
+{
+	/* FIXME: Attributes */
+	return TRUE;
+}
+
+static GnomeVFSFileType
+search_directory_file_get_file_type (NautilusFile *file)
+{
+	return GNOME_VFS_FILE_TYPE_DIRECTORY;
+}			      
+
+static gboolean
+search_directory_file_get_item_count (NautilusFile *file, 
+				      guint *count,
+				      gboolean *count_unreadable)
+{
+	/* FIXME: It would be nice to have an item count for the sidebar */
+	return FALSE;
+}
+    
+static void
+nautilus_search_directory_file_init (gpointer object, gpointer klass)
+{
+	NautilusSearchDirectoryFile *search_file;
+
+	search_file = NAUTILUS_SEARCH_DIRECTORY_FILE (object);
+}
+
+static void
+nautilus_search_directory_file_class_init (gpointer klass)
+{
+	GObjectClass *object_class;
+	NautilusFileClass *file_class;
+
+	object_class = G_OBJECT_CLASS (klass);
+	file_class = NAUTILUS_FILE_CLASS (klass);
+
+	file_class->call_when_ready = search_directory_file_call_when_ready;
+	file_class->cancel_call_when_ready = search_directory_file_cancel_call_when_ready;
+	file_class->get_file_type = search_directory_file_get_file_type;
+	file_class->check_if_ready = search_directory_file_check_if_ready;
+	file_class->get_item_count = search_directory_file_get_item_count;
+
+#if 0	
+	object_class->finalize = search_finalize;
+
+	file_class->monitor_add = search_directory_file_monitor_add;
+	file_class->monitor_remove = search_directory_file_monitor_remove;
+	file_class->call_when_ready = search_directory_file_call_when_ready;
+	file_class->check_if_ready = search_directory_file_check_if_ready;
+	file_class->get_deep_counts = search_directory_file_get_deep_counts;
+	file_class->get_date = search_directory_file_get_date;
+	file_class->get_where_string = search_directory_file_get_where_string;
+#endif
+}
diff --git a/libnautilus-private/nautilus-search-directory-file.h b/libnautilus-private/nautilus-search-directory-file.h
new file mode 100644
index 000000000..57432f887
--- /dev/null
+++ b/libnautilus-private/nautilus-search-directory-file.h
@@ -0,0 +1,55 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   nautilus-search-directory-file.h: Subclass of NautilusFile to implement the
+   the case of the search directory
+ 
+   Copyright (C) 2003 Red Hat, 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: Alexander Larsson <alexl@redhat.com>
+*/
+
+#ifndef NAUTILUS_SEARCH_DIRECTORY_FILE_H
+#define NAUTILUS_SEARCH_DIRECTORY_FILE_H
+
+#include <libnautilus-private/nautilus-file.h>
+
+#define NAUTILUS_TYPE_SEARCH_DIRECTORY_FILE \
+	(nautilus_search_directory_file_get_type ())
+#define NAUTILUS_SEARCH_DIRECTORY_FILE(obj) \
+	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SEARCH_DIRECTORY_FILE, NautilusSearchDirectoryFile))
+#define NAUTILUS_SEARCH_DIRECTORY_FILE_CLASS(klass) \
+	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SEARCH_DIRECTORY_FILE, NautilusSearchDirectoryFileClass))
+#define NAUTILUS_IS_SEARCH_DIRECTORY_FILE(obj) \
+	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SEARCH_DIRECTORY_FILE))
+#define NAUTILUS_IS_SEARCH_DIRECTORY_FILE_CLASS(klass) \
+	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SEARCH_DIRECTORY_FILE))
+
+typedef struct NautilusSearchDirectoryFileDetails NautilusSearchDirectoryFileDetails;
+
+typedef struct {
+	NautilusFile parent_slot;
+	NautilusSearchDirectoryFileDetails *details;
+} NautilusSearchDirectoryFile;
+
+typedef struct {
+	NautilusFileClass parent_slot;
+} NautilusSearchDirectoryFileClass;
+
+GType   nautilus_search_directory_file_get_type (void);
+
+#endif /* NAUTILUS_SEARCH_DIRECTORY_FILE_H */
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
new file mode 100644
index 000000000..b445fb962
--- /dev/null
+++ b/libnautilus-private/nautilus-search-directory.c
@@ -0,0 +1,746 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+   Copyright (C) 2005 Novell, 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: Anders Carlsson <andersca@imendio.com>
+*/
+
+#include <config.h>
+#include "nautilus-search-directory.h"
+
+#include "nautilus-directory-private.h"
+#include "nautilus-file.h"
+#include "nautilus-file-private.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-search-engine.h"
+#include <eel/eel-glib-extensions.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+#include <gtk/gtksignal.h>
+#include <libgnome/gnome-macros.h>
+#include <string.h>
+
+struct NautilusSearchDirectoryDetails {
+	NautilusQuery *query;
+
+	NautilusSearchEngine *engine;
+	
+	gboolean search_finished;
+
+	GList *files;
+	GHashTable *file_hash;
+
+	GList *monitor_list;
+	GList *callback_list;
+	GList *pending_callback_list;
+};
+
+typedef struct {
+	gboolean monitor_hidden_files;
+	gboolean monitor_backup_files;
+	NautilusFileAttributes monitor_attributes;
+
+	gconstpointer client;
+} SearchMonitor;
+
+typedef struct {
+	NautilusSearchDirectory *search_directory;
+
+	NautilusDirectoryCallback callback;
+	gpointer callback_data;
+
+	NautilusFileAttributes wait_for_attributes;
+	gboolean wait_for_file_list;
+	GList *file_list;
+	GHashTable *non_ready_hash;
+} SearchCallback;
+
+GNOME_CLASS_BOILERPLATE (NautilusSearchDirectory, nautilus_search_directory,
+			 NautilusDirectory, NAUTILUS_TYPE_DIRECTORY)
+
+
+static void search_engine_hits_added (NautilusSearchEngine *engine, GList *hits, NautilusSearchDirectory *search);
+static void search_engine_hits_subtracted (NautilusSearchEngine *engine, GList *hits, NautilusSearchDirectory *search);
+static void search_engine_finished (NautilusSearchEngine *engine, NautilusSearchDirectory *search);
+static void search_engine_error (NautilusSearchEngine *engine, const char *error, NautilusSearchDirectory *search);
+static void search_callback_file_ready_callback (NautilusFile *file, gpointer data);
+
+
+static void
+ensure_search_engine (NautilusSearchDirectory *search)
+{
+	if (!search->details->engine) {
+		search->details->engine = nautilus_search_engine_new ();
+		g_signal_connect (search->details->engine, "hits-added",
+				  G_CALLBACK (search_engine_hits_added),
+				  search);
+		g_signal_connect (search->details->engine, "hits-subtracted",
+				  G_CALLBACK (search_engine_hits_subtracted),
+				  search);
+		g_signal_connect (search->details->engine, "finished",
+				  G_CALLBACK (search_engine_finished),
+				  search);
+		g_signal_connect (search->details->engine, "error",
+				  G_CALLBACK (search_engine_error),
+				  search);
+	}
+}
+
+static void
+reset_file_list (NautilusSearchDirectory *search)
+{
+	nautilus_file_list_free (search->details->files);
+	search->details->files = NULL;
+}
+
+static void
+start_or_stop_search_engine (NautilusSearchDirectory *search, gboolean adding)
+{
+	if (adding && (search->details->monitor_list ||
+	    search->details->pending_callback_list) &&
+	    search->details->query) {
+		/* We need to start the search engine */
+		ensure_search_engine (search);
+		nautilus_search_engine_set_query (search->details->engine, search->details->query);
+
+		reset_file_list (search);
+
+		nautilus_search_engine_start (search->details->engine);
+	} else if (!adding && !search->details->monitor_list &&
+		   !search->details->pending_callback_list &&
+		   search->details->engine) {
+		nautilus_search_engine_stop (search->details->engine);
+
+		reset_file_list (search);
+	}
+
+}
+
+static void
+file_changed (NautilusFile *file, NautilusSearchDirectory *search)
+{
+	GList list;
+
+	list.data = file;
+	list.next = NULL;
+
+	if (!g_object_get_data (G_OBJECT (file), "has-tag") || TRUE)
+		nautilus_directory_emit_files_changed (NAUTILUS_DIRECTORY (search), &list);
+
+	g_object_set_data (G_OBJECT (file), "has-tag", GINT_TO_POINTER (1));
+}
+
+static void
+search_monitor_add (NautilusDirectory *directory,
+		    gconstpointer client,
+		    gboolean monitor_hidden_files,
+		    gboolean monitor_backup_files,
+		    NautilusFileAttributes file_attributes,
+		    NautilusDirectoryCallback callback,
+		    gpointer callback_data)
+{
+	GList *list;
+	SearchMonitor *monitor;
+	NautilusSearchDirectory *search;
+	NautilusFile *file;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (directory);
+
+	monitor = g_new0 (SearchMonitor, 1);
+	monitor->monitor_hidden_files = monitor_hidden_files;
+	monitor->monitor_backup_files = monitor_backup_files;
+	monitor->monitor_attributes = file_attributes;
+	monitor->client = client;
+
+	search->details->monitor_list = g_list_prepend (search->details->monitor_list, monitor);
+	
+	if (callback != NULL) {
+		(* callback) (directory, search->details->files, callback_data);
+	}
+	
+	for (list = search->details->files; list != NULL; list = list->next) {
+		file = list->data;
+
+		/* Add monitors */
+		nautilus_file_monitor_add (file, monitor, file_attributes);
+	}
+
+	start_or_stop_search_engine (search, TRUE);
+}
+
+static void
+search_monitor_remove_file_monitors (SearchMonitor *monitor, NautilusSearchDirectory *search)
+{
+	GList *list;
+	NautilusFile *file;
+	
+	for (list = search->details->files; list != NULL; list = list->next) {
+		file = list->data;
+
+		nautilus_file_monitor_remove (file, monitor);
+	}
+
+}
+
+static void
+search_monitor_destroy (SearchMonitor *monitor, NautilusSearchDirectory *search)
+{
+	search_monitor_remove_file_monitors (monitor, search);
+
+	g_free (monitor);
+}
+
+static void
+search_monitor_remove (NautilusDirectory *directory,
+		       gconstpointer client)
+{
+	NautilusSearchDirectory *search;
+	SearchMonitor *monitor;
+	GList *list;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (directory);
+
+	for (list = search->details->monitor_list; list != NULL; list = list->next) {
+		monitor = list->data;
+
+		if (monitor->client == client) {
+			search->details->monitor_list = g_list_delete_link (search->details->monitor_list, list);
+
+			search_monitor_destroy (monitor, search);
+
+			break;
+		}
+	}
+
+	start_or_stop_search_engine (search, FALSE);
+}
+
+static void
+cancel_call_when_ready (gpointer key, gpointer value, gpointer user_data)
+{
+	SearchCallback *search_callback;
+	NautilusFile *file;
+
+	file = key;
+	search_callback = user_data;
+
+	nautilus_file_cancel_call_when_ready (file, search_callback_file_ready_callback,
+					      search_callback);
+}
+
+static void
+search_callback_destroy (SearchCallback *search_callback)
+{
+	if (search_callback->non_ready_hash) {
+		g_hash_table_foreach (search_callback->non_ready_hash, cancel_call_when_ready, search_callback);
+		g_hash_table_destroy (search_callback->non_ready_hash);
+	}
+
+	nautilus_file_list_free (search_callback->file_list);
+
+	g_free (search_callback);
+}
+
+static void
+search_callback_invoke_and_destroy (SearchCallback *search_callback)
+{
+	search_callback->callback (NAUTILUS_DIRECTORY (search_callback->search_directory),
+				   search_callback->file_list,
+				   search_callback->callback_data);
+
+	search_callback->search_directory->details->callback_list = 
+		g_list_remove (search_callback->search_directory->details->callback_list, search_callback);
+
+	search_callback_destroy (search_callback);
+}
+
+static void
+search_callback_file_ready_callback (NautilusFile *file, gpointer data)
+{
+	SearchCallback *search_callback = data;
+	
+	g_hash_table_remove (search_callback->non_ready_hash, file);
+
+	if (g_hash_table_size (search_callback->non_ready_hash) == 0) {
+		search_callback_invoke_and_destroy (search_callback);
+	}
+}
+
+static void
+search_callback_add_file_callbacks (SearchCallback *callback)
+{
+	GList *file_list_copy, *list;
+	NautilusFile *file;
+
+	file_list_copy = g_list_copy (callback->file_list);
+
+	for (list = file_list_copy; list != NULL; list = list->next) {
+		file = list->data;
+
+		nautilus_file_call_when_ready (file,
+					       callback->wait_for_attributes,
+					       search_callback_file_ready_callback,
+					       callback);
+	}
+	g_list_free (file_list_copy);
+}
+	 
+static SearchCallback *
+search_callback_find (NautilusSearchDirectory *search, NautilusDirectoryCallback callback, gpointer callback_data)
+{
+	SearchCallback *search_callback;
+	GList *list;
+
+	for (list = search->details->callback_list; list != NULL; list = list->next) {
+		search_callback = list->data;
+
+		if (search_callback->callback == callback &&
+		    search_callback->callback_data == callback_data) {
+			return search_callback;
+		}
+	}
+	
+	return NULL;
+}
+
+static SearchCallback *
+search_callback_find_pending (NautilusSearchDirectory *search, NautilusDirectoryCallback callback, gpointer callback_data)
+{
+	SearchCallback *search_callback;
+	GList *list;
+
+	for (list = search->details->pending_callback_list; list != NULL; list = list->next) {
+		search_callback = list->data;
+
+		if (search_callback->callback == callback &&
+		    search_callback->callback_data == callback_data) {
+			return search_callback;
+		}
+	}
+	
+	return NULL;
+}
+
+static GHashTable *
+file_list_to_hash_table (GList *file_list)
+{
+	GList *list;
+	GHashTable *table;
+
+	if (!file_list)
+		return NULL;
+
+	table = g_hash_table_new (NULL, NULL);
+
+	for (list = file_list; list != NULL; list = list->next) {
+		g_hash_table_insert (table, list->data, list->data);
+	}
+
+	return table;
+}
+
+static void
+search_call_when_ready (NautilusDirectory *directory,
+			NautilusFileAttributes file_attributes,
+			gboolean wait_for_file_list,
+			NautilusDirectoryCallback callback,
+			gpointer callback_data)
+{
+	NautilusSearchDirectory *search;
+	SearchCallback *search_callback;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (directory);
+
+	search_callback = search_callback_find (search, callback, callback_data);
+
+	if (search_callback) {
+		g_warning ("tried to add a new callback while an old one was pending");
+		return;
+	}
+
+	search_callback = g_new0 (SearchCallback, 1);
+	search_callback->search_directory = search;
+	search_callback->callback = callback;
+	search_callback->callback_data = callback_data;
+	search_callback->wait_for_attributes = file_attributes;
+	search_callback->wait_for_file_list = wait_for_file_list;
+
+	if (wait_for_file_list) {
+		/* Add it to the pending callback list, which will be
+		 * processed when the directory has finished loading
+		 */
+		search->details->pending_callback_list = 
+			g_list_prepend (search->details->pending_callback_list, search_callback);
+
+		/* We might need to start the search engine */
+		start_or_stop_search_engine (search, TRUE);
+	} else {
+		search_callback->file_list = nautilus_file_list_copy (search->details->files);
+		search_callback->non_ready_hash = file_list_to_hash_table (search->details->files);
+
+		if (!search_callback->non_ready_hash) {
+			/* If there are no ready files, we invoke the callback
+			   with an empty list.
+			*/
+			search_callback_invoke_and_destroy (search_callback);
+		} else {
+			search->details->callback_list = g_list_prepend (search->details->callback_list, search_callback);
+			search_callback_add_file_callbacks (search_callback);
+		}
+	}
+}
+
+static void
+search_cancel_callback (NautilusDirectory *directory,
+			NautilusDirectoryCallback callback,
+			gpointer callback_data)
+{
+	NautilusSearchDirectory *search;
+	SearchCallback *search_callback;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (directory);
+	search_callback = search_callback_find (search, callback, callback_data);
+	
+	if (search_callback) {
+		search->details->callback_list = g_list_remove (search->details->callback_list, search_callback);
+		
+		search_callback_destroy (search_callback);
+		
+		return;
+	} 
+
+	/* Check for a pending callback */
+	search_callback = search_callback_find_pending (search, callback, callback_data);
+
+	if (search_callback) {
+		search->details->pending_callback_list = g_list_remove (search->details->pending_callback_list, search_callback);
+
+		search_callback_destroy (search_callback);
+
+		/* We might need to stop the search engine now */
+		start_or_stop_search_engine (search, FALSE);
+	}
+}
+
+
+static void
+search_engine_hits_added (NautilusSearchEngine *engine, GList *hits, 
+			  NautilusSearchDirectory *search)
+{
+	GList *hit_list;
+	GList *file_list;
+	NautilusFile *file;
+	char *uri;
+	SearchMonitor *monitor;
+	GList *monitor_list;
+
+	file_list = NULL;
+
+	for (hit_list = hits; hit_list != NULL; hit_list = hit_list->next) {
+		uri = hit_list->data;
+		file = nautilus_file_get (uri);
+		
+		for (monitor_list = search->details->monitor_list; monitor_list; monitor_list = monitor_list->next) {
+			monitor = monitor_list->data;
+
+			/* Add monitors */
+			nautilus_file_monitor_add (file, monitor, monitor->monitor_attributes);
+		}
+
+		g_signal_connect (file, "changed", G_CALLBACK (file_changed), search),
+
+		file_list = g_list_prepend (file_list, file);
+	}
+	
+	nautilus_directory_emit_files_added (NAUTILUS_DIRECTORY (search), file_list);
+
+	search->details->files = g_list_concat (search->details->files, file_list);
+}
+
+static void
+search_engine_hits_subtracted (NautilusSearchEngine *engine, GList *hits, 
+			       NautilusSearchDirectory *search)
+{
+	GList *hit_list;
+	GList *monitor_list;
+	SearchMonitor *monitor;
+	GList *file_list;
+	char *uri;
+	NautilusFile *file;
+
+	file_list = NULL;
+
+	for (hit_list = hits; hit_list != NULL; hit_list = hit_list->next) {
+		uri = hit_list->data;
+		file = nautilus_file_get (uri);
+
+		for (monitor_list = search->details->monitor_list; monitor_list; 
+		     monitor_list = monitor_list->next) {
+			monitor = monitor_list->data;
+			/* Remove monitors */
+			nautilus_file_monitor_remove (file, monitor);
+		}
+		
+		g_signal_handlers_disconnect_by_func (file, file_changed, search);
+
+		search->details->files = g_list_remove (search->details->files, file);
+
+		file_list = g_list_prepend (file_list, file);
+	}
+	
+	nautilus_directory_emit_files_changed (NAUTILUS_DIRECTORY (search), file_list);
+
+	nautilus_file_list_free (file_list);
+}
+
+static void
+search_callback_add_pending_file_callbacks (SearchCallback *callback)
+{
+	callback->file_list = nautilus_file_list_copy (callback->search_directory->details->files);
+	callback->non_ready_hash = file_list_to_hash_table (callback->search_directory->details->files);
+
+	search_callback_add_file_callbacks (callback);
+}
+
+static void
+search_remove_file_connections (NautilusSearchDirectory *search)
+{
+	GList *list;
+	NautilusFile *file;
+
+	/* Remove file connections */
+	for (list = search->details->files; list != NULL; list = list->next) {
+		file = list->data;
+
+		g_signal_handlers_disconnect_by_func (file, file_changed, search);
+	}
+
+}
+
+static void
+search_engine_error (NautilusSearchEngine *engine, const char *error_message, NautilusSearchDirectory *search)
+{
+	nautilus_directory_emit_load_error (NAUTILUS_DIRECTORY (search),
+					    -1, error_message);
+}
+
+static void
+search_engine_finished (NautilusSearchEngine *engine, NautilusSearchDirectory *search)
+{
+	search->details->search_finished = TRUE;
+
+	nautilus_directory_emit_done_loading (NAUTILUS_DIRECTORY (search));
+
+	/* Add all file callbacks */
+	g_list_foreach (search->details->pending_callback_list, 
+			(GFunc)search_callback_add_pending_file_callbacks, NULL);
+	search->details->callback_list = g_list_concat (search->details->callback_list,
+							search->details->pending_callback_list);
+
+	g_list_free (search->details->pending_callback_list);
+	search->details->pending_callback_list = NULL;
+}
+
+static void
+search_force_reload (NautilusDirectory *directory)
+{
+	NautilusSearchDirectory *search;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (directory);
+
+	if (!search->details->query) {
+		return;
+	}
+	
+	search->details->search_finished = FALSE;
+
+	if (!search->details->engine) {
+		return;
+	}
+
+	/* Remove file monitors */
+	g_list_foreach (search->details->monitor_list,
+			(GFunc)search_monitor_remove_file_monitors, search);
+
+	/* Remove file connections */
+	search_remove_file_connections (search);
+
+	reset_file_list (search);
+
+	nautilus_search_engine_stop (search->details->engine);
+	nautilus_search_engine_set_query (search->details->engine, search->details->query);
+	nautilus_search_engine_start (search->details->engine);
+}
+
+static gboolean
+search_are_all_files_seen (NautilusDirectory *directory)
+{
+	NautilusSearchDirectory *search;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (directory);
+
+	return (!search->details->query ||
+		search->details->search_finished);
+}
+
+static gboolean
+search_contains_file (NautilusDirectory *directory,
+		      NautilusFile *file)
+{
+	NautilusSearchDirectory *search;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (directory);
+
+	/* FIXME: Maybe put the files in a hash */
+	return (g_list_find (search->details->files, file) != NULL);
+}
+
+static GList *
+search_get_file_list (NautilusDirectory *directory)
+{
+	NautilusSearchDirectory *search;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (directory);
+
+	return nautilus_file_list_copy (search->details->files);
+}
+
+
+static gboolean
+search_is_editable (NautilusDirectory *directory)
+{
+	return FALSE;
+}
+
+static void
+search_dispose (GObject *object)
+{
+	NautilusSearchDirectory *search;
+	GList *list;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (object);
+	
+	/* Remove search monitors */
+	if (search->details->monitor_list) {
+		for (list = search->details->monitor_list; list != NULL; list = list->next) {
+			search_monitor_destroy ((SearchMonitor *)list->data, search);
+		}
+
+		g_list_free (search->details->monitor_list);
+		search->details->monitor_list = NULL;
+	}
+
+	search_remove_file_connections (search);
+	reset_file_list (search);
+	
+	if (search->details->callback_list) {
+		/* Remove callbacks */
+		g_list_foreach (search->details->callback_list,
+				(GFunc)search_callback_destroy, NULL);
+		g_list_free (search->details->callback_list);
+		search->details->callback_list = NULL;
+	}
+
+	if (search->details->pending_callback_list) {
+		g_list_foreach (search->details->pending_callback_list,
+				(GFunc)search_callback_destroy, NULL);
+		g_list_free (search->details->pending_callback_list);
+		search->details->pending_callback_list = NULL;
+	}
+
+	if (search->details->query) {
+		g_free (search->details->query);
+		search->details->query = NULL;
+	}
+
+	G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+search_finalize (GObject *object)
+{
+	NautilusSearchDirectory *search;
+
+	search = NAUTILUS_SEARCH_DIRECTORY (object);
+
+	g_free (search->details);
+
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+nautilus_search_directory_instance_init (NautilusSearchDirectory *search)
+{
+	search->details = g_new0 (NautilusSearchDirectoryDetails, 1);
+}
+
+static void
+nautilus_search_directory_class_init (NautilusSearchDirectoryClass *class)
+{
+	NautilusDirectoryClass *directory_class;
+
+	G_OBJECT_CLASS (class)->dispose = search_dispose;
+	G_OBJECT_CLASS (class)->finalize = search_finalize;
+
+	directory_class = NAUTILUS_DIRECTORY_CLASS (class);
+
+ 	directory_class->are_all_files_seen = search_are_all_files_seen;
+	directory_class->contains_file = search_contains_file;
+	directory_class->force_reload = search_force_reload;
+	directory_class->call_when_ready = search_call_when_ready;
+	directory_class->cancel_callback = search_cancel_callback;
+
+	directory_class->file_monitor_add = search_monitor_add;
+	directory_class->file_monitor_remove = search_monitor_remove;
+	
+	directory_class->get_file_list = search_get_file_list;
+	directory_class->is_editable = search_is_editable;
+}
+
+static int counter;
+     
+char *
+nautilus_search_directory_generate_new_uri (void)
+{
+	char *uri;
+
+	uri = g_strdup_printf (EEL_SEARCH_URI"///%d/", counter);
+	counter ++;
+
+	return uri;
+}
+
+
+void
+nautilus_search_directory_set_query (NautilusSearchDirectory *search,
+				     NautilusQuery *query)
+{
+	g_object_ref (query);
+
+	if (search->details->query) {
+		g_object_unref (search->details->query);
+	}
+
+	search->details->query = query;
+}
+
+NautilusQuery *
+nautilus_search_directory_get_query (NautilusSearchDirectory *search)
+{
+	return search->details->query;
+}
+
diff --git a/libnautilus-private/nautilus-search-directory.h b/libnautilus-private/nautilus-search-directory.h
new file mode 100644
index 000000000..fff621db6
--- /dev/null
+++ b/libnautilus-private/nautilus-search-directory.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   nautilus-search-directory.h: Subclass of NautilusDirectory to implement
+   a virtual directory consisting of the search directory and the search
+   icons
+ 
+   Copyright (C) 2005 Novell, 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.
+*/
+
+#ifndef NAUTILUS_SEARCH_DIRECTORY_H
+#define NAUTILUS_SEARCH_DIRECTORY_H
+
+#include <libnautilus-private/nautilus-directory.h>
+#include <libnautilus-private/nautilus-query.h>
+
+#define NAUTILUS_TYPE_SEARCH_DIRECTORY \
+	(nautilus_search_directory_get_type ())
+#define NAUTILUS_SEARCH_DIRECTORY(obj) \
+	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SEARCH_DIRECTORY, NautilusSearchDirectory))
+#define NAUTILUS_SEARCH_DIRECTORY_CLASS(klass) \
+	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SEARCH_DIRECTORY, NautilusSearchDirectoryClass))
+#define NAUTILUS_IS_SEARCH_DIRECTORY(obj) \
+	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SEARCH_DIRECTORY))
+#define NAUTILUS_IS_SEARCH_DIRECTORY_CLASS(klass) \
+	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SEARCH_DIRECTORY))
+
+typedef struct NautilusSearchDirectoryDetails NautilusSearchDirectoryDetails;
+
+typedef struct {
+	NautilusDirectory parent_slot;
+	NautilusSearchDirectoryDetails *details;
+} NautilusSearchDirectory;
+
+typedef struct {
+	NautilusDirectoryClass parent_slot;
+} NautilusSearchDirectoryClass;
+
+GType   nautilus_search_directory_get_type             (void);
+
+char   *nautilus_search_directory_generate_new_uri     (void);
+
+NautilusQuery *nautilus_search_directory_get_query (NautilusSearchDirectory *search);
+void           nautilus_search_directory_set_query (NautilusSearchDirectory *search,
+						    NautilusQuery           *query);
+
+#endif /* NAUTILUS_SEARCH_DIRECTORY_H */
diff --git a/libnautilus-private/nautilus-search-engine-beagle.c b/libnautilus-private/nautilus-search-engine-beagle.c
new file mode 100644
index 000000000..fd6576498
--- /dev/null
+++ b/libnautilus-private/nautilus-search-engine-beagle.c
@@ -0,0 +1,246 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Anders Carlsson <andersca@imendio.com>
+ *
+ */
+
+#include <config.h>
+#include "nautilus-search-engine-beagle.h"
+#include <beagle/beagle.h>
+
+#include <eel/eel-gtk-macros.h>
+
+struct NautilusSearchEngineBeagleDetails {
+	BeagleClient *client;
+	NautilusQuery *query;
+
+	BeagleQuery *current_query;
+	gboolean query_finished;
+};
+
+
+static void  nautilus_search_engine_beagle_class_init       (NautilusSearchEngineBeagleClass *class);
+static void  nautilus_search_engine_beagle_init             (NautilusSearchEngineBeagle      *engine);
+
+G_DEFINE_TYPE (NautilusSearchEngineBeagle,
+	       nautilus_search_engine_beagle,
+	       NAUTILUS_TYPE_SEARCH_ENGINE);
+
+static NautilusSearchEngineClass *parent_class = NULL;
+
+static void
+finalize (GObject *object)
+{
+	NautilusSearchEngineBeagle *beagle;
+
+	beagle = NAUTILUS_SEARCH_ENGINE_BEAGLE (object);
+	
+	if (beagle->details->current_query) {
+		g_object_unref (beagle->details->current_query);
+	}
+
+	if (beagle->details->query) {
+		g_object_unref (beagle->details->query);
+	}
+
+	if (beagle->details->client) {
+		g_object_unref (beagle->details->client);
+	}
+
+	g_free (beagle->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+static void
+beagle_hits_added (BeagleQuery *query, 
+		   BeagleHitsAddedResponse *response, 
+		   NautilusSearchEngineBeagle *engine)
+{
+	GSList *hits, *list;
+	GList *hit_uris;
+
+	hit_uris = NULL;
+
+	hits = beagle_hits_added_response_get_hits (response);
+	
+	for (list = hits; list != NULL; list = list->next) {
+		BeagleHit *hit = BEAGLE_HIT (list->data);
+
+		hit_uris = g_list_prepend (hit_uris, (char *)beagle_hit_get_uri (hit));
+	}
+
+	nautilus_search_engine_hits_added (NAUTILUS_SEARCH_ENGINE (engine), hit_uris);
+	g_list_free (hit_uris);
+}
+
+static void
+beagle_hits_subtracted (BeagleQuery *query, 
+			BeagleHitsSubtractedResponse *response, 
+			NautilusSearchEngineBeagle *engine)
+{
+	GSList *uris, *list;
+	GList *hit_uris;
+
+	hit_uris = NULL;
+
+	uris = beagle_hits_subtracted_response_get_uris (response);
+	
+	for (list = uris; list != NULL; list = list->next) {
+		hit_uris = g_list_prepend (hit_uris, (char *)list->data);
+	}
+
+	nautilus_search_engine_hits_subtracted (NAUTILUS_SEARCH_ENGINE (engine), hit_uris);
+	g_list_free (hit_uris);
+}
+
+static void
+beagle_finished (BeagleQuery *query, 
+		 BeagleFinishedResponse *response,
+		 NautilusSearchEngineBeagle *engine)
+{
+	/* For some reason we keep getting finished events,
+	 * only emit finished once */
+	if (engine->details->query_finished) {
+		return;
+	}
+	
+	engine->details->query_finished = TRUE;
+	nautilus_search_engine_finished (NAUTILUS_SEARCH_ENGINE (engine));
+}
+
+static void
+beagle_error (BeagleQuery *query,
+	      GError *error,
+	      NautilusSearchEngineBeagle *engine)
+{
+	nautilus_search_engine_error (NAUTILUS_SEARCH_ENGINE (engine), error->message);
+}
+
+static void
+nautilus_search_engine_beagle_start (NautilusSearchEngine *engine)
+{
+	NautilusSearchEngineBeagle *beagle;
+	GError *error;
+
+	error = NULL;
+	beagle = NAUTILUS_SEARCH_ENGINE_BEAGLE (engine);
+
+	if (beagle->details->current_query) {
+		return;
+	}
+
+	if (beagle->details->client == NULL) {
+		beagle->details->client = beagle_client_new (NULL);
+
+		if (beagle->details->client == NULL) {
+			nautilus_search_engine_error (engine,
+						      "Unable to connect to search service.");
+			return;
+		}
+	}
+
+	beagle->details->query_finished = FALSE;
+	beagle->details->current_query = beagle_query_new ();
+	g_signal_connect (beagle->details->current_query,
+			  "hits-added", G_CALLBACK (beagle_hits_added), engine);
+	g_signal_connect (beagle->details->current_query,
+			  "hits-subtracted", G_CALLBACK (beagle_hits_subtracted), engine);
+	g_signal_connect (beagle->details->current_query,
+			  "finished", G_CALLBACK (beagle_finished), engine);
+	g_signal_connect (beagle->details->current_query,
+			  "error", G_CALLBACK (beagle_error), engine);
+
+	beagle_query_add_text (beagle->details->current_query,
+			       nautilus_query_get_text (beagle->details->query));
+	/* We only want files */
+	beagle_query_add_hit_type (beagle->details->current_query,
+				   "File");
+	beagle_query_set_max_hits (beagle->details->current_query,
+				   1000);
+	if (!beagle_client_send_request_async (beagle->details->client,
+					       BEAGLE_REQUEST (beagle->details->current_query), &error)) {
+		nautilus_search_engine_error (engine, error->message);
+		g_error_free (error);
+	}
+}
+
+static void
+nautilus_search_engine_beagle_stop (NautilusSearchEngine *engine)
+{
+	NautilusSearchEngineBeagle *beagle;
+
+	beagle = NAUTILUS_SEARCH_ENGINE_BEAGLE (engine);
+
+	if (beagle->details->current_query) {
+		g_object_unref (beagle->details->current_query);
+		beagle->details->current_query = NULL;
+	}
+}
+
+static void
+nautilus_search_engine_beagle_set_query (NautilusSearchEngine *engine, NautilusQuery *query)
+{
+	NautilusSearchEngineBeagle *beagle;
+
+	beagle = NAUTILUS_SEARCH_ENGINE_BEAGLE (engine);
+	
+	g_object_ref (query);
+
+	if (beagle->details->query) {
+		g_object_unref (query);
+	}
+
+	beagle->details->query = query;
+}
+
+static void
+nautilus_search_engine_beagle_class_init (NautilusSearchEngineBeagleClass *class)
+{
+	GObjectClass *gobject_class;
+	NautilusSearchEngineClass *engine_class;
+
+	parent_class = g_type_class_peek_parent (class);
+
+	gobject_class = G_OBJECT_CLASS (class);
+	gobject_class->finalize = finalize;
+
+	engine_class = NAUTILUS_SEARCH_ENGINE_CLASS (class);
+	engine_class->set_query = nautilus_search_engine_beagle_set_query;
+	engine_class->start = nautilus_search_engine_beagle_start;
+	engine_class->stop = nautilus_search_engine_beagle_stop;
+}
+
+static void
+nautilus_search_engine_beagle_init (NautilusSearchEngineBeagle *engine)
+{
+	engine->details = g_new0 (NautilusSearchEngineBeagleDetails, 1);
+}
+
+
+NautilusSearchEngineBeagle *
+nautilus_search_engine_beagle_new (void)
+{
+	NautilusSearchEngineBeagle *engine;
+
+	engine = g_object_new (NAUTILUS_TYPE_SEARCH_ENGINE_BEAGLE, NULL);
+
+	return engine;
+}
diff --git a/libnautilus-private/nautilus-search-engine-beagle.h b/libnautilus-private/nautilus-search-engine-beagle.h
new file mode 100644
index 000000000..bec18ebfc
--- /dev/null
+++ b/libnautilus-private/nautilus-search-engine-beagle.h
@@ -0,0 +1,51 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Anders Carlsson <andersca@imendio.com>
+ *
+ */
+
+#ifndef NAUTILUS_SEARCH_ENGINE_BEAGLE_H
+#define NAUTILUS_SEARCH_ENGINE_BEAGLE_H
+
+#include <libnautilus-private/nautilus-search-engine.h>
+
+#define NAUTILUS_TYPE_SEARCH_ENGINE_BEAGLE		(nautilus_search_engine_beagle_get_type ())
+#define NAUTILUS_SEARCH_ENGINE_BEAGLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_SEARCH_ENGINE_BEAGLE, NautilusSearchEngineBeagle))
+#define NAUTILUS_SEARCH_ENGINE_BEAGLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SEARCH_ENGINE_BEAGLE, NautilusSearchEngineBeagleClass))
+#define NAUTILUS_IS_SEARCH_ENGINE_BEAGLE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_SEARCH_ENGINE_BEAGLE))
+#define NAUTILUS_IS_SEARCH_ENGINE_BEAGLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SEARCH_ENGINE_BEAGLE))
+#define NAUTILUS_SEARCH_ENGINE_BEAGLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_SEARCH_ENGINE_BEAGLE, NautilusSearchEngineBeagleClass))
+
+typedef struct NautilusSearchEngineBeagleDetails NautilusSearchEngineBeagleDetails;
+
+typedef struct NautilusSearchEngineBeagle {
+	NautilusSearchEngine parent;
+	NautilusSearchEngineBeagleDetails *details;
+} NautilusSearchEngineBeagle;
+
+typedef struct {
+	NautilusSearchEngineClass parent_class;
+} NautilusSearchEngineBeagleClass;
+
+GType          nautilus_search_engine_beagle_get_type  (void);
+
+NautilusSearchEngineBeagle* nautilus_search_engine_beagle_new       (void);
+
+#endif /* NAUTILUS_SEARCH_ENGINE_BEAGLE_H */
diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
new file mode 100644
index 000000000..768a24e57
--- /dev/null
+++ b/libnautilus-private/nautilus-search-engine.c
@@ -0,0 +1,205 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Anders Carlsson <andersca@imendio.com>
+ *
+ */
+
+#include <config.h>
+#include "nautilus-search-engine.h"
+#include "nautilus-search-engine-beagle.h"
+
+#include <eel/eel-gtk-macros.h>
+
+struct NautilusSearchEngineDetails {
+	char *text;
+	guint id;
+	gboolean emitted;
+	
+	int i;
+};
+
+enum {
+	HITS_ADDED,
+	HITS_SUBTRACTED,
+	FINISHED,
+	ERROR,
+	LAST_SIGNAL
+}; 
+
+static guint signals[LAST_SIGNAL];
+
+static void  nautilus_search_engine_class_init       (NautilusSearchEngineClass *class);
+static void  nautilus_search_engine_init             (NautilusSearchEngine      *engine);
+
+G_DEFINE_ABSTRACT_TYPE (NautilusSearchEngine,
+			nautilus_search_engine,
+			G_TYPE_OBJECT);
+
+static GObjectClass *parent_class = NULL;
+
+static void
+finalize (GObject *object)
+{
+	NautilusSearchEngine *engine;
+
+	engine = NAUTILUS_SEARCH_ENGINE (object);
+	
+	g_free (engine->details->text);
+	g_free (engine->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+static void
+nautilus_search_engine_class_init (NautilusSearchEngineClass *class)
+{
+	GObjectClass *gobject_class;
+
+	parent_class = g_type_class_peek_parent (class);
+
+	gobject_class = G_OBJECT_CLASS (class);
+	gobject_class->finalize = finalize;
+
+	signals[HITS_ADDED] =
+		g_signal_new ("hits-added",
+		              G_TYPE_FROM_CLASS (class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusSearchEngineClass, hits_added),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__POINTER,
+		              G_TYPE_NONE, 1,
+			      G_TYPE_POINTER);
+
+	signals[HITS_SUBTRACTED] =
+		g_signal_new ("hits-subtracted",
+		              G_TYPE_FROM_CLASS (class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusSearchEngineClass, hits_subtracted),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__POINTER,
+		              G_TYPE_NONE, 1,
+			      G_TYPE_POINTER);
+
+	signals[FINISHED] =
+		g_signal_new ("finished",
+		              G_TYPE_FROM_CLASS (class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusSearchEngineClass, finished),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
+	
+	signals[ERROR] =
+		g_signal_new ("error",
+		              G_TYPE_FROM_CLASS (class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusSearchEngineClass, error),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__STRING,
+		              G_TYPE_NONE, 1,
+			      G_TYPE_STRING);
+
+}
+
+static void
+nautilus_search_engine_init (NautilusSearchEngine *engine)
+{
+	engine->details = g_new0 (NautilusSearchEngineDetails, 1);
+}
+
+gboolean
+nautilus_search_engine_enabled (void)
+{
+#ifdef HAVE_BEAGLE
+	return TRUE;
+#endif
+	return FALSE;
+}
+
+NautilusSearchEngine *
+nautilus_search_engine_new (void)
+{
+#ifdef HAVE_BEAGLE
+	return g_object_new (NAUTILUS_TYPE_SEARCH_ENGINE_BEAGLE,  NULL);
+#endif
+	return NULL;
+}
+
+void
+nautilus_search_engine_set_query (NautilusSearchEngine *engine, NautilusQuery *query)
+{
+	g_return_if_fail (NAUTILUS_IS_SEARCH_ENGINE (engine));
+	g_return_if_fail (NAUTILUS_SEARCH_ENGINE_GET_CLASS (engine)->set_query != NULL);
+
+	NAUTILUS_SEARCH_ENGINE_GET_CLASS (engine)->set_query (engine, query);
+}
+
+void
+nautilus_search_engine_start (NautilusSearchEngine *engine)
+{
+	g_return_if_fail (NAUTILUS_IS_SEARCH_ENGINE (engine));
+	g_return_if_fail (NAUTILUS_SEARCH_ENGINE_GET_CLASS (engine)->start != NULL);
+
+	NAUTILUS_SEARCH_ENGINE_GET_CLASS (engine)->start (engine);
+}
+
+
+void
+nautilus_search_engine_stop (NautilusSearchEngine *engine)
+{
+	g_return_if_fail (NAUTILUS_IS_SEARCH_ENGINE (engine));
+	g_return_if_fail (NAUTILUS_SEARCH_ENGINE_GET_CLASS (engine)->stop != NULL);
+
+	NAUTILUS_SEARCH_ENGINE_GET_CLASS (engine)->stop (engine);
+}
+
+void	       
+nautilus_search_engine_hits_added (NautilusSearchEngine *engine, GList *hits)
+{
+	g_return_if_fail (NAUTILUS_IS_SEARCH_ENGINE (engine));
+
+	g_signal_emit (engine, signals[HITS_ADDED], 0, hits);
+}
+
+
+void	       
+nautilus_search_engine_hits_subtracted (NautilusSearchEngine *engine, GList *hits)
+{
+	g_return_if_fail (NAUTILUS_IS_SEARCH_ENGINE (engine));
+
+	g_signal_emit (engine, signals[HITS_SUBTRACTED], 0, hits);
+}
+
+
+void	       
+nautilus_search_engine_finished (NautilusSearchEngine *engine)
+{
+	g_return_if_fail (NAUTILUS_IS_SEARCH_ENGINE (engine));
+
+	g_signal_emit (engine, signals[FINISHED], 0);
+}
+
+void
+nautilus_search_engine_error (NautilusSearchEngine *engine, const char *error_message)
+{
+	g_return_if_fail (NAUTILUS_IS_SEARCH_ENGINE (engine));
+
+	g_signal_emit (engine, signals[ERROR], 0, error_message);
+}
diff --git a/libnautilus-private/nautilus-search-engine.h b/libnautilus-private/nautilus-search-engine.h
new file mode 100644
index 000000000..421089c2c
--- /dev/null
+++ b/libnautilus-private/nautilus-search-engine.h
@@ -0,0 +1,74 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Anders Carlsson <andersca@imendio.com>
+ *
+ */
+
+#ifndef NAUTILUS_SEARCH_ENGINE_H
+#define NAUTILUS_SEARCH_ENGINE_H
+
+#include <glib-object.h>
+#include <libgnomevfs/gnome-vfs-result.h>
+#include <libnautilus-private/nautilus-query.h>
+
+#define NAUTILUS_TYPE_SEARCH_ENGINE		(nautilus_search_engine_get_type ())
+#define NAUTILUS_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_SEARCH_ENGINE, NautilusSearchEngine))
+#define NAUTILUS_SEARCH_ENGINE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SEARCH_ENGINE, NautilusSearchEngineClass))
+#define NAUTILUS_IS_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_SEARCH_ENGINE))
+#define NAUTILUS_IS_SEARCH_ENGINE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SEARCH_ENGINE))
+#define NAUTILUS_SEARCH_ENGINE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_SEARCH_ENGINE, NautilusSearchEngineClass))
+
+typedef struct NautilusSearchEngineDetails NautilusSearchEngineDetails;
+
+typedef struct NautilusSearchEngine {
+	GObject parent;
+	NautilusSearchEngineDetails *details;
+} NautilusSearchEngine;
+
+typedef struct {
+	GObjectClass parent_class;
+	
+	/* VTable */
+	void (*set_query) (NautilusSearchEngine *engine, NautilusQuery *query);
+	void (*start) (NautilusSearchEngine *engine);
+	void (*stop) (NautilusSearchEngine *engine);
+
+	/* Signals */
+	void (*hits_added) (NautilusSearchEngine *engine, GList *hits);
+	void (*hits_subtracted) (NautilusSearchEngine *engine, GList *hits);
+	void (*finished) (NautilusSearchEngine *engine);
+	void (*error) (NautilusSearchEngine *engine, const char *error_message);
+} NautilusSearchEngineClass;
+
+GType          nautilus_search_engine_get_type  (void);
+gboolean       nautilus_search_engine_enabled (void);
+
+NautilusSearchEngine* nautilus_search_engine_new       (void);
+
+void           nautilus_search_engine_set_query (NautilusSearchEngine *engine, NautilusQuery *query);
+void	       nautilus_search_engine_start (NautilusSearchEngine *engine);
+void	       nautilus_search_engine_stop (NautilusSearchEngine *engine);
+
+void	       nautilus_search_engine_hits_added (NautilusSearchEngine *engine, GList *hits);
+void	       nautilus_search_engine_hits_subtracted (NautilusSearchEngine *engine, GList *hits);
+void	       nautilus_search_engine_finished (NautilusSearchEngine *engine);
+void	       nautilus_search_engine_error (NautilusSearchEngine *engine, const char *error_message);
+
+#endif /* NAUTILUS_SEARCH_ENGINE_H */
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index 65db7b65e..4a6e2c5be 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -178,28 +178,27 @@ thumbnail_thread_starter_cb (gpointer data)
 }
 
 void
-nautilus_update_thumbnail_file_copied (const char *source_file_uri,
-				       const char *destination_file_uri)
+nautilus_update_thumbnail_file_renamed (const char *old_file_uri, const char *new_file_uri)
 {
 	char *old_thumbnail_path;
 	GdkPixbuf *pixbuf;
 	GnomeVFSFileInfo *file_info;
 	GnomeThumbnailFactory *factory;
 	
-	old_thumbnail_path = gnome_thumbnail_path_for_uri (source_file_uri, GNOME_THUMBNAIL_SIZE_NORMAL);
+	old_thumbnail_path = gnome_thumbnail_path_for_uri (old_file_uri, GNOME_THUMBNAIL_SIZE_NORMAL);
 	if (old_thumbnail_path != NULL &&
 	    g_file_test (old_thumbnail_path, G_FILE_TEST_EXISTS)) {
 		file_info = gnome_vfs_file_info_new ();
-		if (gnome_vfs_get_file_info (destination_file_uri,
+		if (gnome_vfs_get_file_info (new_file_uri,
 					     file_info,
 					     GNOME_VFS_FILE_INFO_DEFAULT) == GNOME_VFS_OK) {
 			pixbuf = gdk_pixbuf_new_from_file (old_thumbnail_path, NULL);
 			
-			if (pixbuf && gnome_thumbnail_has_uri (pixbuf, source_file_uri)) {
+			if (pixbuf && gnome_thumbnail_has_uri (pixbuf, old_file_uri)) {
 				factory = nautilus_icon_factory_get_thumbnail_factory ();
 				gnome_thumbnail_factory_save_thumbnail (factory,
 									pixbuf,
-									destination_file_uri,
+									new_file_uri,
 									file_info->mtime);
 				g_object_unref (factory);
 			}
@@ -208,6 +207,7 @@ nautilus_update_thumbnail_file_copied (const char *source_file_uri,
 				g_object_unref (pixbuf);
 			}
 			
+			unlink (old_thumbnail_path);
 		}
 		gnome_vfs_file_info_unref (file_info);
 	}
@@ -215,24 +215,16 @@ nautilus_update_thumbnail_file_copied (const char *source_file_uri,
 	g_free (old_thumbnail_path);
 }
 
-void
-nautilus_update_thumbnail_file_renamed (const char *source_file_uri,
-					const char *destination_file_uri)
-{
-	nautilus_update_thumbnail_file_copied (source_file_uri, destination_file_uri);
-	nautilus_remove_thumbnail_for_file (source_file_uri);
-}
-
 void 
-nautilus_remove_thumbnail_for_file (const char *file_uri)
+nautilus_remove_thumbnail_for_file (const char *old_file_uri)
 {
-	char *thumbnail_path;
+	char *old_thumbnail_path;
 	
-	thumbnail_path = gnome_thumbnail_path_for_uri (file_uri, GNOME_THUMBNAIL_SIZE_NORMAL);
-	if (thumbnail_path != NULL) {
-		unlink (thumbnail_path);
+	old_thumbnail_path = gnome_thumbnail_path_for_uri (old_file_uri, GNOME_THUMBNAIL_SIZE_NORMAL);
+	if (old_thumbnail_path != NULL) {
+		unlink (old_thumbnail_path);
 	}
-	g_free (thumbnail_path);
+	g_free (old_thumbnail_path);
 }
 
 void
diff --git a/libnautilus-private/nautilus-thumbnails.h b/libnautilus-private/nautilus-thumbnails.h
index 402cf4fd7..65b462906 100644
--- a/libnautilus-private/nautilus-thumbnails.h
+++ b/libnautilus-private/nautilus-thumbnails.h
@@ -32,11 +32,9 @@
 void       nautilus_create_thumbnail                (NautilusFile *file);
 void       nautilus_thumbnail_frame_image           (GdkPixbuf **pixbuf);
 GdkPixbuf *nautilus_thumbnail_load_framed_image     (const char   *path);
-void       nautilus_update_thumbnail_file_copied    (const char   *source_file_uri,
-						     const char   *destination_file_uri);
-void       nautilus_update_thumbnail_file_renamed   (const char   *source_file_uri,
-						     const char   *destination_file_uri);
-void       nautilus_remove_thumbnail_for_file       (const char   *file_uri);
+void       nautilus_update_thumbnail_file_renamed   (const char   *old_file_uri,
+						     const char   *new_file_uri);
+void       nautilus_remove_thumbnail_for_file       (const char   *old_file_uri);
 
 /* Queue handling: */
 void       nautilus_thumbnail_remove_from_queue     (const char   *file_uri);
diff --git a/libnautilus-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c
index b254ef961..aebbfb0f1 100644
--- a/libnautilus-private/nautilus-trash-directory.c
+++ b/libnautilus-private/nautilus-trash-directory.c
@@ -265,14 +265,6 @@ volume_mounted_callback (GnomeVFSVolumeMonitor *monitor,
 }
 
 static void
-volume_unmounted_callback (GnomeVFSVolumeMonitor *monitor,
-			   GnomeVFSVolume *volume,
-			   NautilusTrashDirectory *trash)
-{
-	remove_volume (trash, volume);
-}
-
-static void
 nautilus_trash_directory_instance_init (NautilusTrashDirectory *trash)
 {
 	GnomeVFSVolumeMonitor *volume_monitor;
@@ -286,8 +278,6 @@ nautilus_trash_directory_instance_init (NautilusTrashDirectory *trash)
 				 G_CALLBACK (volume_mounted_callback), trash, 0);
 	g_signal_connect_object (volume_monitor, "volume_pre_unmount",
 				 G_CALLBACK (volume_unmount_started_callback), trash, 0);
-	g_signal_connect_object (volume_monitor, "volume_unmounted",
-				 G_CALLBACK (volume_unmounted_callback), trash, 0);
 }
 
 /* Finish initializing a new NautilusTrashDirectory. We have to do the
diff --git a/libnautilus-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c
index 07fe30484..77126bdf4 100644
--- a/libnautilus-private/nautilus-trash-file.c
+++ b/libnautilus-private/nautilus-trash-file.c
@@ -624,8 +624,7 @@ trash_file_get_deep_counts (NautilusFile *file,
 			 &one_directory_count,
 			 &one_file_count,
 			 &one_unreadable_directory_count,
-			 &one_total_size,
-			 TRUE);
+			 &one_total_size);
 		
 		if (one_status < status) {
 			status = one_status;
diff --git a/po/ChangeLog b/po/ChangeLog
index 0f73b4f8c..c865602cd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,30 +1,3 @@
-2005-09-24  Erdal Ronahi  <erdal.ronahi@gmail.com>
-
-	* ku.po: Updated Kurdish translation.
-
-2005-09-18  Christian Rose  <menthos@menthos.com>
-
-	* sv.po: Updated Swedish translation.
-
-2005-09-16  Clytie Siddall <clytie@riverland.net.au>
-
-        * vi.po: Updated Vietnamese translation.
-
-2005-09-14  Runa Bhattacharjee <runa@bengalinux.org>
-
-	* bn.po: Updated Bengali (bn) Translation by
-	Progga <progga@bengalinux.org>
-
-2005-09-10  Erdal Ronahi  <erdal.ronahi@gmail.com>
-
-        * ku.po: Added Kurdish translation
-
-2005-09-07  Inaki Larranaga  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-=== nautilus 2.12.0 ===
-
 2005-09-04  Hendrik Richter  <hendi@gnome-de.org>
 
 	* de.po: Updated German translation.
diff --git a/po/bn.po b/po/bn.po
index 8bb64219c..3a06744a0 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,21 +1,29 @@
 # Bangla Translation of the Nautilus pot file.
-# Copyright (C) 2003-2005 The Nautilus Authors.
+# Copyright (C) 2003, 2004 Eazel, Inc.
 # This file is distributed under the same license as the Nautilus package.
-# Progga <progga@BengaLinux.Org>, 2003-2005.
+# Progga <abulfazl@juniv.edu>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Nautilus HEAD\n"
+"Project-Id-Version: Nautilus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-14 19:44+0530\n"
-"PO-Revision-Date: 2005-09-04 20:00+0600\n"
-"Last-Translator: Progga <progga@BengaLinux.Org>\n"
-"Language-Team: Bangla <gnome-translation@BengaLinux.Org>\n"
+"POT-Creation-Date: 2005-02-10 12:02+0100\n"
+"PO-Revision-Date: 2004-09-02 09:00+0600\n"
+"Last-Translator: Progga <abulfazl@juniv.edu>\n"
+"Language-Team: Bangla <gnome-translation@bengalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: data/applications.desktop.in.h:1
+msgid "Applications"
+msgstr "অ�যাপলিকেশন"
+
+#: data/applications.desktop.in.h:2
+msgid "Browse available software"
+msgstr "ব�যবহারযোগ�য সফটওয়ারের তালিকা ব�রাউজ করো"
+
 #: data/browser.xml.h:1
 msgid "Apparition"
 msgstr "ভূত"
@@ -159,7 +167,7 @@ msgid "Envy"
 msgstr "ঈর�ষা"
 
 #: data/browser.xml.h:35 src/nautilus-emblem-sidebar.c:941
-#: src/nautilus-property-browser.c:1779
+#: src/nautilus-property-browser.c:1731
 msgid "Erase"
 msgstr "ম�ছে ফেলো"
 
@@ -187,7 +195,7 @@ msgstr "ফ�লেল"
 msgid "Fossil"
 msgstr "ফসিল"
 
-#: data/browser.xml.h:42
+#: data/browser.xml.h:42 icons/gnome/gnome.xml.h:2
 msgid "GNOME"
 msgstr "গনোম"
 
@@ -332,59 +340,215 @@ msgstr "আকাশী রিজ ( Ridge )"
 msgid "Snow Ridge"
 msgstr "ত�ষার রিজ ( Ridge )"
 
-#. translators: this is the name of an emblem
-#: data/browser.xml.h:79
+#: data/browser.xml.h:78
 msgid "Sound"
 msgstr "শব�দ"
 
-#: data/browser.xml.h:80
+#: data/browser.xml.h:79
 msgid "Special"
 msgstr "বিশেষ"
 
-#: data/browser.xml.h:81
+#: data/browser.xml.h:80
 msgid "Stucco"
 msgstr "সিমেন�টের নকশা করা দেয়াল"
 
-#: data/browser.xml.h:82
+#: data/browser.xml.h:81
 msgid "Tangerine"
 msgstr "ছোট স�গন�ধময় কমলালেব�"
 
-#: data/browser.xml.h:83
+#: data/browser.xml.h:82
 msgid "Terracotta"
 msgstr "টেরাকোটা"
 
-#: data/browser.xml.h:84
+#: data/browser.xml.h:83
 msgid "Urgent"
 msgstr "জর�রি"
 
-#: data/browser.xml.h:85
+#: data/browser.xml.h:84
 msgid "Violet"
 msgstr "বেগ�নী"
 
-#: data/browser.xml.h:86
+#: data/browser.xml.h:85
 msgid "Wavy White"
 msgstr "ঢেউ খেলানো সাদা"
 
-#: data/browser.xml.h:87
+#: data/browser.xml.h:86
 msgid "Web"
 msgstr "জাল"
 
-#: data/browser.xml.h:88
+#: data/browser.xml.h:87
 msgid "White"
 msgstr "সাদা"
 
-#: data/browser.xml.h:89
+#: data/browser.xml.h:88
 msgid "White Ribs"
 msgstr "ঢেউ খেলানো সাদা"
 
-#: data/browser.xml.h:90
+#: data/browser.xml.h:89
 msgid "_Emblems"
 msgstr "প�রতীক (_প)"
 
-#: data/browser.xml.h:91
+#: data/browser.xml.h:90
 msgid "_Patterns"
 msgstr "প�যাটার�ন (_প)"
 
+#: data/favorites.desktop.in.h:1
+msgid "Favorite applications"
+msgstr "প�রিয় অ�যাপলিকেশন"
+
+#: data/favorites.desktop.in.h:2
+msgid "Favorites"
+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/crux_teal/crux_teal.xml.h:1
+msgid "A Teal variation of the Crux theme."
+msgstr "ক�রাক�স থিমের �কটি ব�নোহা�সজাতীয় রূপভেদ।"
+
+#: icons/crux_teal/crux_teal.xml.h:2
+msgid "Crux-Teal"
+msgstr "ক�রাক�স-ব�নোহা�স"
+
+#: icons/default/default.xml.h:1
+msgid "Eazel"
+msgstr "ইজেল"
+
+#: icons/default/default.xml.h:2
+msgid "This is the default theme for Nautilus."
+msgstr "�টিই নটিলাসের ডিফল�ট থিম।"
+
+#: icons/gnome/gnome.xml.h:1
+msgid "A theme designed to fit well with the classic GNOME environment."
+msgstr "ক�লাসিক গনোম-�র সাথে মানানসই �কটি থিম।"
+
+#: icons/sierra/sierra.xml.h:1
+msgid "Sierra"
+msgstr "সিয়েরা"
+
+#: icons/sierra/sierra.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr "ম�যানিলা ফোল�ডার ও ধূসর-সব�জ পটভূমি ব�যবহার করে।"
+
+#: icons/tahoe/tahoe.xml.h:1
+msgid "Tahoe"
+msgstr "টাহো"
+
+#: icons/tahoe/tahoe.xml.h:2
+msgid "This theme uses photo-realistic folders."
+msgstr "�ই থিমটি �মন ফোল�ডার ব�যবহার করে যা ছবির মত বাস�তব দেখায়।"
+
+#: libnautilus-extension/nautilus-column.c:175
+#: libnautilus-extension/nautilus-menu-item.c:206
+#: libnautilus-extension/nautilus-property-page.c:176
+#: libnautilus-private/nautilus-column-utilities.c:43
+#: src/file-manager/fm-list-view.c:1107
+msgid "Name"
+msgstr "নাম"
+
+#: libnautilus-extension/nautilus-column.c:176
+msgid "Name of the column"
+msgstr "কলামের নাম"
+
+#: libnautilus-extension/nautilus-column.c:182
+msgid "Attribute"
+msgstr "বৈশিষ�ট�য"
+
+#: libnautilus-extension/nautilus-column.c:183
+msgid "The attribute name to display"
+msgstr "যে বৈশিষ�ট�যসূচক নামটি প�রদর�শন করা হবে"
+
+#: libnautilus-extension/nautilus-column.c:189
+#: libnautilus-extension/nautilus-menu-item.c:213
+#: libnautilus-extension/nautilus-property-page.c:183
+msgid "Label"
+msgstr "লেবেল"
+
+#: libnautilus-extension/nautilus-column.c:190
+msgid "Label to display in the column"
+msgstr "কলামে যে লেবেল প�রদর�শন করা হবে"
+
+#: libnautilus-extension/nautilus-column.c:196
+#: src/file-manager/fm-ditem-page.c:343 src/file-manager/fm-ditem-page.c:354
+msgid "Description"
+msgstr "বিবরণ"
+
+#: libnautilus-extension/nautilus-column.c:197
+msgid "A user-visible description of the column"
+msgstr "ব�যবহারকারীর নিকট দৃশ�যমান কলামের বিবরণ"
+
+#: libnautilus-extension/nautilus-column.c:204
+msgid "xalign"
+msgstr "�ক�স-অক�ষীয়-অ�যালাইন"
+
+#: libnautilus-extension/nautilus-column.c:205
+msgid "The x-alignment of the column"
+msgstr "কলামের �ক�স-অক�ষীয় অ�যালাইনমেন�ট"
+
+#: libnautilus-extension/nautilus-menu-item.c:207
+msgid "Name of the item"
+msgstr "জিনিষের নাম"
+
+#: libnautilus-extension/nautilus-menu-item.c:214
+msgid "Label to display to the user"
+msgstr "ব�যবহারকারীর নিকট যে লেবেল প�রদর�শন করা হবে"
+
+#: libnautilus-extension/nautilus-menu-item.c:220
+msgid "Tip"
+msgstr "ইঙ�গিত"
+
+#: libnautilus-extension/nautilus-menu-item.c:221
+msgid "Tooltip for the menu item"
+msgstr "মেন� আইটেমের ট�লটিপ"
+
+#: libnautilus-extension/nautilus-menu-item.c:227
+msgid "Icon"
+msgstr "আইকন"
+
+#: libnautilus-extension/nautilus-menu-item.c:228
+msgid "Name of the icon to display in the menu item"
+msgstr "মেন� আইটেমে আইকনের যে নাম প�রদর�শন করা হবে"
+
+#: libnautilus-extension/nautilus-menu-item.c:235
+msgid "Sensitive"
+msgstr "সংবেদনশীল"
+
+# FIXME: মেন� আইটেম আবার সংবেদনশীল হয় ক�যামনে ?  �ইটা কি মান�ষ নাকি ?@!#$!
+#: libnautilus-extension/nautilus-menu-item.c:236
+msgid "Whether the menu item is sensitive"
+msgstr "মেন� আইটেম সংবেদনশীল কিনা"
+
+#: libnautilus-extension/nautilus-menu-item.c:242
+msgid "Priority"
+msgstr "অগ�রাধিকার"
+
+# FIXME
+#: libnautilus-extension/nautilus-menu-item.c:243
+msgid "Show priority text in toolbars"
+msgstr "ট�লবারে অগ�রাধিকার প�রাপ�ত টেক�সট প�রদর�শন করো"
+
+#: libnautilus-extension/nautilus-property-page.c:177
+msgid "Name of the page"
+msgstr "পৃষ�ঠার নাম"
+
+#: libnautilus-extension/nautilus-property-page.c:184
+msgid "Label widget to display in the notebook tab"
+msgstr "নোটবই ট�যাব-� যে লেবেল উইজেট প�রদর�শন করা হবে"
+
+#: libnautilus-extension/nautilus-property-page.c:190
+msgid "Page"
+msgstr "পৃষ�ঠা"
+
+#: libnautilus-extension/nautilus-property-page.c:191
+msgid "Widget for the property page"
+msgstr "বৈশিষ�ট�যসূচক পৃষ�ঠার জন�য উইজেট"
+
 # FIXME:  There's a conflict among the translation of \"date_modified\" and \"date_changed\".
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:1
 msgid ""
@@ -401,8 +565,8 @@ msgstr ""
 "প�রকাশিত অন�মতি\" �বং \"মাইমের ধরন\"।"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
-msgid "Always use the location entry, instead of the pathbar"
-msgstr ""
+msgid "Bring up a new window for every opened file"
+msgstr "প�রত�যেকটি খোলা ফাইলের জন�য �কটি করে নত�ন উইন�ডো খোলো"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
 msgid "Computer icon visible on desktop"
@@ -582,21 +746,13 @@ msgstr "�টির মান সত�য (true) হলে নত�ন উই
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid ""
-"If set to true, then Nautilus browser windows will always use a textual "
-"input entry for the location toolbar, instead of the pathbar."
-msgstr ""
-"�টির মান সত�য (true) হলে নটিলাসের ব�রাউজার উইন�ডো, অবস�থান-নির�দেশক ট�লবারে সর�বদাই "
-"পাথ-বার �র পরিবর�তে �কটি টেক�সটভিত�তিক ইনপ�ট �ন�ট�রি ব�যবহার করবে।"
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
-msgid ""
 "If set to true, then Nautilus lets you edit some of the more esoteric "
 "options of a file in the file preferences dialog."
 msgstr ""
 "�টির মান 'সত�য' ( True ) হলে ফাইল সংক�রান�ত পছন�দসূচক ডায়ালগে আরো কিছ� দ�র�বোধ�য অপশন "
 "সম�পাদন করতে পারবেন।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
@@ -604,7 +760,7 @@ msgstr ""
 "�টির মান সত�য (true) হলে নটিলাসের আইকন দৃশ�য ও তালিকা দৃশ�যে ফাইলের পূর�বে ফোল�ডার "
 "প�রদর�শন করা হয়।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "put files in the trash."
@@ -613,6 +769,14 @@ msgstr ""
 "করবেন, তখন নটিলাস আপনার কাছে জানতে চাইবে যে �ই স�থানান�তরের ব�যাপারে আপনি "
 "নিশ�চিত কিনা।"
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+msgid ""
+"If set to true, then Nautilus will bring up a new Nautilus window by default "
+"whenever an item is opened."
+msgstr ""
+"�টির মান সত�য (true) হলে প�রত�যেকবার কোন জিনিষ খোলার সময় নটিলাস �কটি করে নত�ন "
+"উইন�ডো চাল� করবে।"
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "�টির মান সত�য (true) হলে নটিলাস ডেস�কটপের আইকনগ�লো আ�কবে।"
@@ -793,47 +957,45 @@ msgstr "আইকনের পাশে লেবেল থাকবে"
 msgid "Reverse sort order in new windows"
 msgstr "নত�ন উইন�ডোতে আইকনগ�লো উল�টো ধারায় সাজাবে"
 
-#. Translators: please note this can choose the size. e.g.
-#. "Sans 15". Please do not change "Sans", only change the size if you need to. In
-#. most cases, this should be left alone.
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#. Translators: please note this can choose the default font and the size. e.g. "Monospace 8". Please do not translate "Sans". In most cases, this should be left alone.
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 msgid "Sans 10"
-msgstr "স�যান�স ১০"
+msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "Show folders first in windows"
 msgstr "উইন�ডো প�রদর�শনকালে প�রথমে ফোল�ডার দেখাও"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid "Show location bar in new windows"
 msgstr "নত�ন উইন�ডোতে অবস�থানসূচক বার দেখাও"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid "Show mounted volumes on the desktop"
 msgstr "ডেস�কটপে মাউন�টকৃত ভলিউম দেখাও"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid "Show side pane in new windows"
 msgstr "নত�ন উইন�ডোতে সাইড পেন দেখাও"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "Show status bar in new windows"
 msgstr "নত�ন উইন�ডোতে অবস�থাসূচক বার দেখাও"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "Show toolbar in new windows"
 msgstr "নত�ন উইন�ডোতে ট�লবার দেখাও"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid "Side pane view"
 msgstr "সাইড পেন দৃশ�য"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
 "Speed tradeoff for when to preview a sound file when mousing over a files "
 "icon. If set to \"always\" then always plays the sound, even if the file is "
 "on a remote server. If set to \"local_only\" then only plays previews on "
-"local file systems. If set to \"never\" then it never previews sound."
+"local filesystems. If set to \"never\" then it never previews sound."
 msgstr ""
 "শব�দধারী ফাইলের ওপর দিয়ে মাউস নিয়ে গেলে ফাইলটি বাজানো হবে কিনা, সে সংক�রান�ত "
 "সিদ�ধান�ত।  যদি �র মান হয় \"সর�বদা\", তবে ফাইলটি �মনকি দূরবর�তী কোন সার�ভারে "
@@ -841,12 +1003,12 @@ msgstr ""
 "ফাইল সিস�টেমের ফাইলগ�লোকেই কেবল বাজানো হবে।  কিন�ত� �র মান \"কখনো নয়\" হলে তা "
 "কখনোই মাউসের ছো�য়ার কারণে বাজানো হবে না।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid ""
 "Speed tradeoff for when to show a preview of text file contents in the "
 "file's icon. If set to \"always\" then always show previews, even if the "
 "folder is on a remote server. If set to \"local_only\" then only show "
-"previews for local file systems. If set to \"never\" then never bother to "
+"previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
 "টেক�সট ফাইলের আইকনে ফাইলের লেখার প�রাকদর�শন প�রদর�শন করা হবে কিনা, সে সংক�রান�ত "
@@ -855,27 +1017,27 @@ msgstr ""
 "প�রাকদর�শন শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমের ফাইলের ক�ষেত�রেই প�রযোজ�য হবে।  কিন�ত� �টির "
 "মান \"কখনো নয়\" হলে কোন অবস�থাতেই প�রাকদর�শন প�রদর�শনের চেষ�টা করা হবে না।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
 "\"always\" then always thumbnail, even if the folder is on a remote server. "
-"If set to \"local_only\" then only show thumbnails for local file systems. "
-"If set to \"never\" then never bother to thumbnail images, just use a "
-"generic icon."
+"If set to \"local_only\" then only show thumbnails for local filesystems. If "
+"set to \"never\" then never bother to thumbnail images, just use a generic "
+"icon."
 msgstr ""
 "ছবির ফাইলের থাম�বনেইল প�রদর�শন করা হবে কিনা, সে সংক�রান�ত সিদ�ধান�ত। যদি �র মান হয় "
 "\"সর�বদা\", তবে ফাইলের অবস�থান �মনকি দূরবর�তী সার�ভারে হলেও তার থাম�বনেইল প�রদর�শন "
 "করা হবে।  আর �র মান যদি হয় \"শ�ধ�মাত�র স�থানীয়\", তবে থাম�বনেইল প�রদর�শন শ�ধ�মাত�র "
 "স�থানীয় ফাইল সিস�টেমের ফাইলের ক�ষেত�রেই প�রযোজ�য হবে।  কিন�ত� �টির মান \"কখনো নয়\" "
-"হলে কোন অবস�থাতেই থাম�বনেইল প�রদর�শন করা হবে না; �ক�ষেত�রে বরং সকল ছবির জন�যই �কটি "
-"সাধারণ আইকন ব�যবহার করা হবে।"
+"হলে কোন অবস�থাতেই থাম�বনেইল প�রদর�শন করা হবে না; �ক�ষেত�রে বরং সকল ছনির জন�যই �কটি "
+"সাধারণ ( Common ) আইকন ব�যবহার করা হবে।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
 msgid ""
 "Speed tradeoff for when to show the number of items in a folder. If set to "
 "\"always\" then always show item counts, even if the folder is on a remote "
-"server. If set to \"local_only\" then only show counts for local file "
-"systems. If set to \"never\" then never bother to compute item counts."
+"server. If set to \"local_only\" then only show counts for local "
+"filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "কোন ফোল�ডারে অবস�থিত জিনিষের সংখ�যা প�রদর�শন করা হবে কিনা, সে সংক�রান�ত সিদ�ধান�ত।  "
 "�র মান \"সর�বদা\" হলে ফোল�ডারের অবস�থান �মনকি দূরবর�তী সার�ভারে হলেও ফোল�ডারস�থ "
@@ -883,7 +1045,7 @@ msgstr ""
 "স�থানীয় ফাইল সিস�টেমের ক�ষেত�রেই �টি প�রযোজ�য হবে। কিন�ত� �র মান \"কখনো নয়\" হলে কোন "
 "অবস�থাতেই ফোল�ডারস�থ জিনিষপত�র গোনা হবে না।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
@@ -891,7 +1053,7 @@ msgstr ""
 "স�বাভাবিক অবস�থায় আইকন দৃশ�যে যে সব বিষয়ের ভিত�তিতে জিনিষপত�র সাজানো হয়।  সম�ভাব�য "
 "মানগ�লো হল \"নাম\", \"আকার\", \"ধরন\", \"পরিবর�তনের তারিখ\", �বং \"প�রতীক\"।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
 msgid ""
 "The default sort-order for the items in the list view. Possible values are "
 "\"name\", \"size\", \"type\", and \"modification_date\"."
@@ -899,15 +1061,15 @@ msgstr ""
 "স�বাভাবিক অবস�থায় তালিকা দৃশ�যে যে সব বিষয়ের ভিত�তিতে জিনিষপত�র সাজানো হয়।  সম�ভাব�য "
 "মানগ�লো হল \"নাম\", \"আকার\", \"ধরন\", �বং \"পরিবর�তনের তারিখ\"।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 msgid "The default width of the side pane in new windows."
 msgstr "স�বাভাবিক অবস�থায় নত�ন উইন�ডোতে সাইড পেনের প�রস�থ।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "The font description used for the icons on the desktop."
 msgstr "ডেস�কটপের আইকনের জন�য ফন�টের যে বর�ণনা ব�যবহৃত হবে।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
@@ -915,11 +1077,11 @@ msgstr ""
 "ফাইলের তারিখের বিন�যাস।  সম�ভাব�য মানসমূহ হল \"locale\", \"আই.�স.ও.\", �বং "
 "\"অনান�ষ�ঠানিক\"।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid "The side pane view to show in newly opened windows."
 msgstr "নত�ন খোলা উইন�ডোতে যে সাইড পেন দৃশ�য প�রদর�শন করা হবে।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 msgid ""
 "This name can be set if you want a custom name for the computer icon on the "
 "desktop."
@@ -927,7 +1089,7 @@ msgstr ""
 "ডেস�কটপে অবস�থিত কম�পিউটার আইকনের জন�য স�বনির�বাচিত কোন নাম ব�যবহার করতে হলে �ই "
 "নামটি নির�ধারণ করতে হবে।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
@@ -935,7 +1097,7 @@ msgstr ""
 "ডেস�কটপে অবস�থিত ব�যক�তিগত ফোল�ডারের আইকনের জন�য স�বনির�বাচিত কোন নাম ব�যবহার করতে "
 "চাইলেতা �খানে লিখতে পারেন।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
@@ -943,29 +1105,29 @@ msgstr ""
 "ডেস�কটপে অবস�থিত আবর�জনার বাক�সের আইকনের জন�য স�বনির�বাচিত কোন নাম ব�যবহার করতে "
 "চাইলেতা �খানে লিখতে পারেন।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 msgid "Trash icon visible on desktop"
 msgstr "আবর�জনার বাক�সের আইকন ডেস�কটপে দৃশ�যমান"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Type of click used to launch/open files"
 msgstr "ফাইল চাল�-করতে/খ�লতে যে ভাবে ক�লিক করতে হবে"
 
 # FIXME
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Use manual layout in new windows"
 msgstr "নত�ন উইন�ডোতে আইকনগ�লো নিজ হাতে সাজাতে হবে"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid "Use tighter layout in new windows"
 msgstr "নত�ন উইন�ডোতে আইকনগ�লো ঘনভাবে সাজাও"
 
 # FIXME
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
 msgid "What to do with executable text files when activated"
 msgstr "�ক�সিকিউটেবল টেক�সট ফাইলে ক�লিক করা হলে কি করা হবে"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
 msgid ""
 "What to do with executable text files when they are activated (single or "
 "double clicked). Possible values are \"launch\" to launch them as programs, "
@@ -978,7 +1140,7 @@ msgstr ""
 "�কটি ডায়ালগের সাহায�যে জানতে চাওয়া হবে, �বং \"প�রদর�শন\" �তে করে টেক�সট ফাইলের "
 "লেখা প�রদর�শন করা হবে।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
 msgid ""
 "When a folder is visited this viewer is used unless you have selected "
 "another view for that particular folder. Possible values are \"list_view\" "
@@ -988,78 +1150,89 @@ msgstr ""
 "পরিদর�শনের সময় �ই দৃশ�যটি ব�যবহার করা হবে।  সম�ভাব�য মানগ�লো হল \"তালিকা_দৃশ�য\" �বং "
 "\"আইকন_দৃশ�য\"।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
 msgid "When to show number of items in a folder"
 msgstr "কখন ফোল�ডারস�থ জিনিষের সংখ�যা দেখানো হবে"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:101
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
 msgid "When to show preview text in icons"
 msgstr "কখন আইকনের মধ�যে প�রাকদর�শনীয় টেক�সট দেখানো হবে"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:102
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
 msgid "When to show thumbnails of image files"
 msgstr "কখন ছবির থাম�বনেইল প�রদর�শন করা হবে"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:103
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:101
 msgid "Whether a custom default folder background has been set."
 msgstr "ফোল�ডারের জন�য কোন স�বনির�বাচিত পটভূমি আছে কিনা।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:102
 msgid "Whether a custom default side pane background has been set."
 msgstr "সাইড পেন-�র জন�য কোন স�বনির�বাচিত পটভূমি আছে কিনা।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:105
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:103
 msgid "Whether to ask for confirmation when moving files to trash"
 msgstr ""
 "আবর�জনার বাক�সে ফাইল সরিয়ে নেওয়ার পূর�বে নিশ�চিত হওয়ার জন�য জিজ�ঞাসা করা হবে কিনা"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
 msgid "Whether to enable immediate deletion"
 msgstr "তাত��ক�ষণিকভাবে ফাইল ম�ছে ফেলার ব�যবস�থা সক�রিয় করা হবে কিনা"
 
 # FIXME: �ই Sound Preview-�র ব�যাপারটা ঠিক ব��লাম না ;-(
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:105
 msgid "Whether to preview sounds when mousing over an icon"
 msgstr "শব�দধারী ফাইলের ওপর দিয়ে মাউস চালানোর সময় শব�দ বাজানো হবে কিনা"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
 msgid "Whether to show backup files"
 msgstr "ব�যাকআপ ফাইল দেখানো হবে কিনা"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
 msgid "Whether to show hidden files"
 msgstr "ল�ক�কায়িত ফাইল দেখানো হবে কিনা"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
 msgid "Width of the side pane"
 msgstr "সাইড পেন-�র প�রস�থ"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:386
+msgid "Cut _Text"
+msgstr "টেক�সট কাট করো (_ট)"
+
 #. label, accelerator
-#: libnautilus-private/nautilus-clipboard.c:442
+#: libnautilus-private/nautilus-clipboard.c:387
 msgid "Cut the selected text to the clipboard"
 msgstr "চিহ�নিত টেক�সটকে ক�লিপবোর�ডে কাট করো"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:390
+msgid "_Copy Text"
+msgstr "টেক�সট কপি করো (_ক)"
+
 #. label, accelerator
-#: libnautilus-private/nautilus-clipboard.c:446
+#: libnautilus-private/nautilus-clipboard.c:391
 msgid "Copy the selected text to the clipboard"
 msgstr "চিহ�নিত টেক�সটকে ক�লিপবোর�ডে কপি করো"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:394
+msgid "_Paste Text"
+msgstr "টেক�সট পেস�ট করো (_স)"
+
 #. label, accelerator
-#: libnautilus-private/nautilus-clipboard.c:450
+#: libnautilus-private/nautilus-clipboard.c:395
 msgid "Paste the text stored on the clipboard"
 msgstr "ক�লিপবোর�ডে সঞ�চিত টেক�সটকে পেস�ট করো"
 
 #. name, stock id
-#: libnautilus-private/nautilus-clipboard.c:453
-#: src/file-manager/fm-directory-view.c:6176
+#: libnautilus-private/nautilus-clipboard.c:398
 msgid "Select _All"
 msgstr "সব কিছ� চিহ�নিত করো (_ন)"
 
 #. label, accelerator
-#: libnautilus-private/nautilus-clipboard.c:454
+#: libnautilus-private/nautilus-clipboard.c:399
 msgid "Select all the text in a text field"
 msgstr "টেক�সট ফিল�ডে প�রদশিত সকল টেক�সট চিহ�নিত করো"
 
@@ -1068,7 +1241,7 @@ msgid "Move _Up"
 msgstr "উপরে যাও (_উ)"
 
 #: libnautilus-private/nautilus-column-chooser.c:404
-msgid "Move Dow_n"
+msgid "Move _Down"
 msgstr "নিচে যাও (_ন)"
 
 #: libnautilus-private/nautilus-column-chooser.c:413
@@ -1076,18 +1249,13 @@ msgid "_Show"
 msgstr "দেখাও (_দ)"
 
 #: libnautilus-private/nautilus-column-chooser.c:423
-msgid "Hi_de"
+msgid "_Hide"
 msgstr "ল�কাও (_ল)"
 
 #: libnautilus-private/nautilus-column-chooser.c:436
-msgid "Use De_fault"
+msgid "_Use Default"
 msgstr "ডিফল�ট ব�যবহার করো (_ব)"
 
-#: libnautilus-private/nautilus-column-utilities.c:43
-#: src/file-manager/fm-list-view.c:1421
-msgid "Name"
-msgstr "নাম"
-
 #: libnautilus-private/nautilus-column-utilities.c:44
 msgid "The name and icon of the file."
 msgstr "ফাইলের নাম ও আইকন।"
@@ -1141,7 +1309,7 @@ msgid "The group of the file."
 msgstr "ফাইলের গ�র�প।"
 
 #: libnautilus-private/nautilus-column-utilities.c:97
-#: src/file-manager/fm-properties-window.c:2992
+#: src/file-manager/fm-properties-window.c:2942
 msgid "Permissions"
 msgstr "অন�মতি"
 
@@ -1165,8 +1333,8 @@ msgstr "মাইমের ধরন"
 msgid "The mime type of the file."
 msgstr "ফাইলের মাইমের ধরন।"
 
-#: libnautilus-private/nautilus-customization-data.c:404
-msgid "Reset"
+#: libnautilus-private/nautilus-customization-data.c:406
+msgid "reset"
 msgstr "রিসেট"
 
 #: libnautilus-private/nautilus-desktop-directory-file.c:442
@@ -1175,61 +1343,56 @@ msgstr "রিসেট"
 msgid "on the desktop"
 msgstr "ডেস�কটপে অবস�থিত"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:114
-#, c-format
-msgid "You cannot move the volume \"%s\" to the trash."
-msgstr "আবর�জনার বাক�সে \"%s\" ভলিউমকে স�থানান�তর করতে পারবেন না।"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "আপনি কোন ভলিউম আইকন ম�ছতে পারবেন না।"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:124
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"If you want to eject the volume, please use Eject in the right-click menu of "
 "the volume."
 msgstr ""
 "ভলিউমটি বের করে নিতে চাইলে অন�গ�রহপূর�বক ভলিউমের আইকনে ডান-বাটন-ক�লিক করে মেন� "
 "থেকে 'বহিষ�কার' চাপ�ন।"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:133
-msgid ""
-"If you want to unmount the volume, please use \"Unmount Volume\" in the "
-"popup menu of the volume."
-msgstr ""
-"ভলিউমটি আনমাউন�ট করতে চাইলে অন�গ�রহপূর�বক ভলিউমের আইকনে ডান-বাটন-ক�লিক করে মেন� "
-"থেকে 'ভলিউম আনমাউন�ট করো' চাপ�ন।"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
+msgstr "ভলিউমটিকে মোছা যাচ�ছে না"
 
-#: libnautilus-private/nautilus-dnd.c:640
+#: libnautilus-private/nautilus-dnd.c:631
 msgid "_Move here"
 msgstr "�খানে সরিয়ে আনো (_�)"
 
-#: libnautilus-private/nautilus-dnd.c:645
+#: libnautilus-private/nautilus-dnd.c:636
 msgid "_Copy here"
 msgstr "�খানে কপি করো (_ক)"
 
 # FIXME
-#: libnautilus-private/nautilus-dnd.c:650
+#: libnautilus-private/nautilus-dnd.c:641
 msgid "_Link here"
 msgstr "�ই স�থান নির�দেশ করে লিঙ�ক তৈরি করো (_ল)"
 
-#: libnautilus-private/nautilus-dnd.c:655
+#: libnautilus-private/nautilus-dnd.c:646
 msgid "Set as _Background"
 msgstr "পটভূমি হিসেবে ব�যবহার করো"
 
-#: libnautilus-private/nautilus-dnd.c:664
-#: libnautilus-private/nautilus-dnd.c:719
+#: libnautilus-private/nautilus-dnd.c:655
+#: libnautilus-private/nautilus-dnd.c:710
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: libnautilus-private/nautilus-dnd.c:705
+#: libnautilus-private/nautilus-dnd.c:696
 msgid "Set as background for _all folders"
 msgstr "প�রতিটি ফোল�ডারের পটভূমি হিসেবে ব�যবহার করো (_ব)"
 
-#: libnautilus-private/nautilus-dnd.c:710
+#: libnautilus-private/nautilus-dnd.c:701
 msgid "Set as background for _this folder"
 msgstr "�ই ফোল�ডারটির পটভূমি হিসেবে ব�যবহার করো (_�)"
 
 #: libnautilus-private/nautilus-emblem-utils.c:197
 #: libnautilus-private/nautilus-emblem-utils.c:202
 #: libnautilus-private/nautilus-emblem-utils.c:257
-#: libnautilus-private/nautilus-emblem-utils.c:275
+#: libnautilus-private/nautilus-emblem-utils.c:274
 msgid "The emblem cannot be installed."
 msgstr "প�রতীকটিকে ইনস�টল করা যাচ�ছে না।"
 
@@ -1240,7 +1403,7 @@ msgstr "দà§�ঃখিত, নতà§�ন পà§�রতীকটির নিরà§
 #: libnautilus-private/nautilus-emblem-utils.c:199
 #: libnautilus-private/nautilus-emblem-utils.c:204
 #: libnautilus-private/nautilus-emblem-utils.c:259
-#: libnautilus-private/nautilus-emblem-utils.c:277
+#: libnautilus-private/nautilus-emblem-utils.c:276
 msgid "Couldn't Install Emblem"
 msgstr "প�রতীক ইনস�টল করা যায় নি"
 
@@ -1271,62 +1434,53 @@ msgstr "প�রতীকটি ইনস�টল করা যায় নি"
 msgid "Sorry, unable to save custom emblem."
 msgstr "দ�ঃখিত, স�বনির�বাচিত প�রতীকটিকে সংরক�ষণ করা যায় নি।"
 
-#: libnautilus-private/nautilus-emblem-utils.c:276
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "দ�ঃখিত, স�বনির�বাচিত প�রতীকের নাম সংরক�ষণ করা যায় নি।"
 
-#: libnautilus-private/nautilus-file-operations-progress.c:169
-#, c-format
-msgid "%s %ld of %ld %s"
-msgstr "%s %ld �র %ld %s"
-
-#: libnautilus-private/nautilus-file-operations-progress.c:448
+#: libnautilus-private/nautilus-file-operations-progress.c:402
 #, c-format
 msgid "(%d:%02d:%d Remaining)"
 msgstr "(%d:%02d:%d অবশিষ�ট আছে)"
 
-#: libnautilus-private/nautilus-file-operations-progress.c:453
+#: libnautilus-private/nautilus-file-operations-progress.c:407
 #, c-format
 msgid "(%d:%02d Remaining)"
 msgstr "(%d:%02d অবশিষ�ট আছে)"
 
-# FIXME
-#: libnautilus-private/nautilus-file-operations.c:362
-#: libnautilus-private/nautilus-file-operations.c:387
-#: libnautilus-private/nautilus-file-utilities.c:70
-#: src/nautilus-connect-server-dialog.c:287
+#: libnautilus-private/nautilus-file-operations-progress.c:520
 #, c-format
-msgid "%s on %s"
-msgstr "%2$s-�র ওপর %1$s"
+msgid "%ld of %ld"
+msgstr "%ld �র %ld"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-private/nautilus-file-operations.c:371
+#: libnautilus-private/nautilus-file-operations.c:358
 msgid "From:"
 msgstr "উত��স:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-private/nautilus-file-operations.c:394
+#: libnautilus-private/nautilus-file-operations.c:373
 msgid "To:"
 msgstr "গন�তব�য:"
 
-#: libnautilus-private/nautilus-file-operations.c:580
-#: libnautilus-private/nautilus-file-operations.c:628
-#: libnautilus-private/nautilus-file-operations.c:633
-#: libnautilus-private/nautilus-file-operations.c:643
+#: libnautilus-private/nautilus-file-operations.c:559
+#: libnautilus-private/nautilus-file-operations.c:607
+#: libnautilus-private/nautilus-file-operations.c:612
+#: libnautilus-private/nautilus-file-operations.c:622
 msgid "Error while moving."
 msgstr "স�থানান�তরের সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:581
+#: libnautilus-private/nautilus-file-operations.c:560
 #, c-format
 msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr "\"%s\"-কে স�থানান�তর করা যাবে না কারণ �টি �কটি অপরিবর�তনীয় ডিস�কে অবস�থিত।"
 
-#: libnautilus-private/nautilus-file-operations.c:591
-#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:570
+#: libnautilus-private/nautilus-file-operations.c:576
 msgid "Error while deleting."
 msgstr "ম�ছে ফেলার সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:592
+#: libnautilus-private/nautilus-file-operations.c:571
 #, c-format
 msgid ""
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
@@ -1335,12 +1489,12 @@ msgstr ""
 "\"%s\"-কে আপনি ম�ছতে পারবেন না কারণ �টি যে ফোল�ডারে অবস�থিত, তা পরিবর�তনের অন�মতি "
 "আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:577
 #, c-format
 msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr "\"%s\"-কে মোছা যাবে না কারণ �টি �কটি অপরিবর�তনীয় ডিস�কে অবস�থিত।"
 
-#: libnautilus-private/nautilus-file-operations.c:629
+#: libnautilus-private/nautilus-file-operations.c:608
 #, c-format
 msgid ""
 "\"%s\" cannot be moved because you do not have permissions to change it or "
@@ -1350,7 +1504,7 @@ msgstr ""
 "তা পরিবর�তনের অন�মতি আপনার নেই।"
 
 # FIXME: ভাল শোনাচ�ছে না ;-(
-#: libnautilus-private/nautilus-file-operations.c:634
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
 "Cannot move \"%s\" because it or its parent folder are contained in the "
@@ -1359,7 +1513,7 @@ msgstr ""
 "\"%s\"-কে স�থানান�তর করা যাবে না কারণ �টি বা �টি যে ফোল�ডারে অবস�থিত, তা গন�তব�য "
 "ফোল�ডারের ভেতরেই রয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:644
+#: libnautilus-private/nautilus-file-operations.c:623
 #, c-format
 msgid ""
 "Cannot move \"%s\" to the trash because you do not have permissions to "
@@ -1368,146 +1522,146 @@ msgstr ""
 "\"%s\"-কে আপনি আবর�জনার বাক�সে স�থানান�তর করতে পারবেন না, কারণ �টি অথবা �টি যে "
 "ফোল�ডারে অবস�থিত, তা পরিবর�তনের অন�মতি আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:666
+#: libnautilus-private/nautilus-file-operations.c:645
 msgid "Error while copying."
 msgstr "কপি করার সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:667
+#: libnautilus-private/nautilus-file-operations.c:646
 #, c-format
 msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr "\"%s\"-কে কপি করা সম�ভব নয় কারণ �টি পড়ার জন�য প�রয়োজনীয় অন�মতি আপনার নেই।"
 
+#: libnautilus-private/nautilus-file-operations.c:666
 #: libnautilus-private/nautilus-file-operations.c:687
-#: libnautilus-private/nautilus-file-operations.c:708
-#: libnautilus-private/nautilus-file-operations.c:712
+#: libnautilus-private/nautilus-file-operations.c:691
 #, c-format
 msgid "Error while copying to \"%s\"."
 msgstr "\"%s\"-� কপি করার সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:688
-#: libnautilus-private/nautilus-file-operations.c:693
-#: libnautilus-private/nautilus-file-operations.c:697
+#: libnautilus-private/nautilus-file-operations.c:667
+#: libnautilus-private/nautilus-file-operations.c:672
+#: libnautilus-private/nautilus-file-operations.c:676
 msgid "There is not enough space on the destination."
 msgstr "গন�তব�যস�থলে যথেষ�ট স�থান ফা�কা নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:692
+#: libnautilus-private/nautilus-file-operations.c:671
 #, c-format
 msgid "Error while moving to \"%s\"."
 msgstr "\"%s\"-� স�থানান�তরের সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:696
+#: libnautilus-private/nautilus-file-operations.c:675
 #, c-format
 msgid "Error while creating link in \"%s\"."
 msgstr "\"%s\"-� লিঙ�ক তৈরির সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:709
-#: libnautilus-private/nautilus-file-operations.c:720
-#: libnautilus-private/nautilus-file-operations.c:731
+#: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:710
 msgid "You do not have permissions to write to this folder."
 msgstr "�ই ফোল�ডারের কোন কিছ� পরিবর�তনের অন�মতি আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:713
-#: libnautilus-private/nautilus-file-operations.c:724
-#: libnautilus-private/nautilus-file-operations.c:735
+#: libnautilus-private/nautilus-file-operations.c:692
+#: libnautilus-private/nautilus-file-operations.c:703
+#: libnautilus-private/nautilus-file-operations.c:714
 msgid "The destination disk is read-only."
 msgstr "গন�তব�যের ডিস�কটি অপরিবর�তনীয়।"
 
-#: libnautilus-private/nautilus-file-operations.c:719
-#: libnautilus-private/nautilus-file-operations.c:723
+#: libnautilus-private/nautilus-file-operations.c:698
+#: libnautilus-private/nautilus-file-operations.c:702
 #, c-format
 msgid "Error while moving items to \"%s\"."
 msgstr "\"%s\"-� জিনিষপত�র স�থানান�তরের সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:730
-#: libnautilus-private/nautilus-file-operations.c:734
+#: libnautilus-private/nautilus-file-operations.c:709
+#: libnautilus-private/nautilus-file-operations.c:713
 #, c-format
 msgid "Error while creating links in \"%s\"."
 msgstr "\"%s\"-�  লিঙ�ক তৈরির সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:762
+#: libnautilus-private/nautilus-file-operations.c:741
 #, c-format
 msgid "Error \"%s\" while copying \"%s\"."
 msgstr "\"%2$s\" কপি করার সময় \"%1$s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:763
-#: libnautilus-private/nautilus-file-operations.c:767
+#: libnautilus-private/nautilus-file-operations.c:742
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:750
+#: libnautilus-private/nautilus-file-operations.c:756
 #: libnautilus-private/nautilus-file-operations.c:771
-#: libnautilus-private/nautilus-file-operations.c:777
-#: libnautilus-private/nautilus-file-operations.c:792
-#: libnautilus-private/nautilus-file-operations.c:796
-#: libnautilus-private/nautilus-file-operations.c:800
-#: libnautilus-private/nautilus-file-operations.c:806
+#: libnautilus-private/nautilus-file-operations.c:775
+#: libnautilus-private/nautilus-file-operations.c:779
+#: libnautilus-private/nautilus-file-operations.c:785
 msgid "Would you like to continue?"
 msgstr "আপনি কি তারপরও �গিয়ে যেতে চান?"
 
-#: libnautilus-private/nautilus-file-operations.c:766
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
 msgid "Error \"%s\" while moving \"%s\"."
 msgstr "\"%2$s\" স�থানান�তরের সময় \"%1$s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:749
 #, c-format
 msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr "\"%2$s\"-কে নির�দেশ করে লিঙ�ক তৈরির সময় \"%1$s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:776
+#: libnautilus-private/nautilus-file-operations.c:755
 #, c-format
 msgid "Error \"%s\" while deleting \"%s\"."
 msgstr "\"%2$s\" মোছার সময় \"%1$s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:791
+#: libnautilus-private/nautilus-file-operations.c:770
 #, c-format
 msgid "Error \"%s\" while copying."
 msgstr "কপি করার সময় \"%s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:795
+#: libnautilus-private/nautilus-file-operations.c:774
 #, c-format
 msgid "Error \"%s\" while moving."
 msgstr "স�থানান�তরের সময় \"%s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:799
+#: libnautilus-private/nautilus-file-operations.c:778
 #, c-format
 msgid "Error \"%s\" while linking."
 msgstr "লিঙ�ক তৈরির সময় \"%s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:805
+#: libnautilus-private/nautilus-file-operations.c:784
 #, c-format
 msgid "Error \"%s\" while deleting."
 msgstr "ম�ছে ফেলার সময় \"%s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:931
+#: libnautilus-private/nautilus-file-operations.c:910
 msgid "Error While Copying"
 msgstr "কপি করার সময় সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-file-operations.c:934
+#: libnautilus-private/nautilus-file-operations.c:913
 msgid "Error While Moving"
 msgstr "স�থানান�তরের সময় সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-file-operations.c:937
+#: libnautilus-private/nautilus-file-operations.c:916
 msgid "Error While Linking"
 msgstr "লিঙ�ক তৈরির সময় সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-file-operations.c:942
+#: libnautilus-private/nautilus-file-operations.c:921
 msgid "Error While Deleting"
 msgstr "ম�ছে ফেলার সময় সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-file-operations.c:961
-#: libnautilus-private/nautilus-file-operations.c:979
-msgid "_Retry"
-msgstr "প�নঃপ�রচেষ�টা (_প)"
-
-#: libnautilus-private/nautilus-file-operations.c:979
-#: libnautilus-private/nautilus-file-operations.c:1128
-#: libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:948
+#: libnautilus-private/nautilus-file-operations.c:969
+#: libnautilus-private/nautilus-file-operations.c:1118
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "_Skip"
 msgstr "�ড়িয়ে যাও (_�)"
 
-#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:969
+msgid "_Retry"
+msgstr "প�নঃপ�রচেষ�টা (_প)"
+
+#: libnautilus-private/nautilus-file-operations.c:1059
 #, c-format
 msgid "Could not move \"%s\" to the new location."
 msgstr "\"%s\"-কে নত�ন অবস�থানে স�থানান�তর করা যায় নি।"
 
-#: libnautilus-private/nautilus-file-operations.c:1072
+#: libnautilus-private/nautilus-file-operations.c:1062
 msgid ""
 "The name is already used for a special item that cannot be removed or "
 "replaced.  If you still want to move the item, rename it and try again."
@@ -1516,12 +1670,12 @@ msgstr ""
 "তারপরও আপনি \"%s\"-কে স�থানান�তর করতে চান, তবে �টির নাম পরিবর�তন করে আবার চেষ�টা "
 "কর�ন।"
 
-#: libnautilus-private/nautilus-file-operations.c:1076
+#: libnautilus-private/nautilus-file-operations.c:1066
 #, c-format
 msgid "Could not copy \"%s\" to the new location."
 msgstr "\"%s\"-কে নত�ন অবস�থানে কপি করা যায় নি।"
 
-#: libnautilus-private/nautilus-file-operations.c:1079
+#: libnautilus-private/nautilus-file-operations.c:1069
 msgid ""
 "The name is already used for a special item that cannot be removed or "
 "replaced.  If you still want to copy the item, rename it and try again."
@@ -1529,47 +1683,49 @@ msgstr ""
 "�ই নামটি ইতিমধ�যেই স�থানান�তর নিষিদ�ধ �কটি বিশেষ ফাইলের জন�য ব�যবহৃত হচ�ছে।  যদি "
 "তারপরও আপনি \"%s\"-কে কপি করতে চান, তবে �টির নাম পরিবর�তন করে আবার চেষ�টা কর�ন।"
 
-#: libnautilus-private/nautilus-file-operations.c:1085
+#: libnautilus-private/nautilus-file-operations.c:1075
 msgid "Unable to Replace File"
 msgstr "ফাইলটিকে প�রতিস�থাপন করা যায় নি।"
 
-#: libnautilus-private/nautilus-file-operations.c:1101
+#: libnautilus-private/nautilus-file-operations.c:1091
 #, c-format
 msgid "The folder \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "\"%s\" নামে ইতিমধ�যেই �কটি ফোল�ডার আছে।  আপনি কি �টিকে প�রতিস�থাপন করতে চান?"
 
-#: libnautilus-private/nautilus-file-operations.c:1104
+#: libnautilus-private/nautilus-file-operations.c:1094
 #, c-format
 msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr "\"%s\" নামে ইতিমধ�যেই �কটি ফাইল আছে।  আপনি কি �টিকে প�রতিস�থাপন করতে চান?"
 
-#: libnautilus-private/nautilus-file-operations.c:1112
+#: libnautilus-private/nautilus-file-operations.c:1102
+#, fuzzy
 msgid ""
 "If you replace the existing folder, any files in it that conflict with the "
 "files being copied will be overwritten."
 msgstr ""
 "কোন বিদ�যমান ফোল�ডার যদি প�রতিস�থাপন করেন, তবে �র অভ�যন�তরস�থ যে সব ফাইলের নাম "
-"প�রতিস�থাপিত ফোল�ডারে রক�ষিত ফাইলের নামের সাথে মিলে যাবে, সেগ�লো হারিয়ে যাবে।"
+"প�রতিস�থাপিত ফোল�ডারে রক�ষিত ফাইলের নামের সাথে মিলে যাবে, সে সব ফাইল প�রতিস�থাপিত "
+"হবে।"
 
-#: libnautilus-private/nautilus-file-operations.c:1114
+#: libnautilus-private/nautilus-file-operations.c:1104
 msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
 "যদি কোন বিদ�যমান ফাইলকে প�রতিস�থাপন করেন, তবে �র অভ�যন�তরস�থ সবকিছ� ম�ছে "
 "( Overwrite ) যাবে।"
 
 # FIXME
-#: libnautilus-private/nautilus-file-operations.c:1127
-#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file-operations.c:1117
+#: libnautilus-private/nautilus-file-operations.c:1136
 msgid "Conflict While Copying"
 msgstr "কপি করার সময় সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1128
-#: libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:1118
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "_Replace"
 msgstr "প�রতিস�থাপন (_প)"
 
-#: libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "Replace _All"
 msgstr "সকল ফাইলকে প�রতিস�থাপন করো"
 
@@ -1578,15 +1734,15 @@ msgstr "সকল ফাইলকে প�রতিস�থাপন করো
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-private/nautilus-file-operations.c:1205
-#: libnautilus-private/nautilus-file.c:4728
-#: src/file-manager/fm-directory-view.c:8479
+#: libnautilus-private/nautilus-file-operations.c:1195
+#: libnautilus-private/nautilus-file.c:4749
+#: src/file-manager/fm-directory-view.c:7905
 #, c-format
 msgid "link to %s"
 msgstr "%s নির�দেশক লিঙ�ক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1209
+#: libnautilus-private/nautilus-file-operations.c:1199
 #, c-format
 msgid "another link to %s"
 msgstr "%s নির�দেশক অপর �কটি লিঙ�ক"
@@ -1595,25 +1751,25 @@ msgstr "%s নির�দেশক অপর �কটি লিঙ�ক"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1225
+#: libnautilus-private/nautilus-file-operations.c:1215
 #, c-format
 msgid "%dst link to %s"
 msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1229
+#: libnautilus-private/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1233
+#: libnautilus-private/nautilus-file-operations.c:1223
 #, c-format
 msgid "%drd link to %s"
 msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1227
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
@@ -1623,12 +1779,12 @@ msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1258
+#: libnautilus-private/nautilus-file-operations.c:1248
 msgid " (copy)"
 msgstr " (কপি)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1260
+#: libnautilus-private/nautilus-file-operations.c:1250
 msgid " (another copy)"
 msgstr " (আরেকটি কপি)"
 
@@ -1636,36 +1792,36 @@ msgstr " (আরেকটি কপি)"
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1263
-#: libnautilus-private/nautilus-file-operations.c:1265
+#: libnautilus-private/nautilus-file-operations.c:1253
+#: libnautilus-private/nautilus-file-operations.c:1255
+#: libnautilus-private/nautilus-file-operations.c:1257
 #: libnautilus-private/nautilus-file-operations.c:1267
-#: libnautilus-private/nautilus-file-operations.c:1277
 msgid "th copy)"
 msgstr " নম�বর কপি)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1270
+#: libnautilus-private/nautilus-file-operations.c:1260
 msgid "st copy)"
 msgstr " নম�বর কপি) "
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1272
+#: libnautilus-private/nautilus-file-operations.c:1262
 msgid "nd copy)"
 msgstr " নম�বর কপি)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1274
+#: libnautilus-private/nautilus-file-operations.c:1264
 msgid "rd copy)"
 msgstr " নম�বর কপি)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1291
+#: libnautilus-private/nautilus-file-operations.c:1281
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (কপি)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1293
+#: libnautilus-private/nautilus-file-operations.c:1283
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (আরেকটি কপি)%s"
@@ -1674,319 +1830,324 @@ msgstr "%s (আরেকটি কপি)%s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: libnautilus-private/nautilus-file-operations.c:1296
-#: libnautilus-private/nautilus-file-operations.c:1298
-#: libnautilus-private/nautilus-file-operations.c:1300
-#: libnautilus-private/nautilus-file-operations.c:1309
+#: libnautilus-private/nautilus-file-operations.c:1286
+#: libnautilus-private/nautilus-file-operations.c:1288
+#: libnautilus-private/nautilus-file-operations.c:1290
+#: libnautilus-private/nautilus-file-operations.c:1299
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d নম�বর কপি)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1303
+#: libnautilus-private/nautilus-file-operations.c:1293
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d নম�বর কপি)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1305
+#: libnautilus-private/nautilus-file-operations.c:1295
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d নম�বর কপি)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1307
+#: libnautilus-private/nautilus-file-operations.c:1297
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d নম�বর কপি)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1407
+#: libnautilus-private/nautilus-file-operations.c:1397
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1415
+#: libnautilus-private/nautilus-file-operations.c:1405
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1611
-#: libnautilus-private/nautilus-file-operations.c:2211
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:1601
+#: libnautilus-private/nautilus-file-operations.c:2194
+#: libnautilus-private/nautilus-file-operations.c:2356
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "অজ�ঞাত GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1948
+#: libnautilus-private/nautilus-file-operations.c:1931
 msgid "Moving files to the Trash"
 msgstr "আবর�জনার বাক�সে ফাইল স�থানান�তর করা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1950
+#: libnautilus-private/nautilus-file-operations.c:1933
+#, fuzzy
 msgid "Throwing out file:"
-msgstr "যেসব ফাইল ফেলে দেওয়া হচ�ছে:"
+msgstr "ফাইলের মালিক।"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1952
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1946
 msgid "Moving"
 msgstr "স�থানান�তর করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1953
+#: libnautilus-private/nautilus-file-operations.c:1936
 msgid "Preparing to Move to Trash..."
 msgstr "আবর�জনার বাক�সে ফেলে দেওয়ার জন�য প�রস�ত�তি নেওয়া হচ�ছে..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1959
+#: libnautilus-private/nautilus-file-operations.c:1942
 msgid "Moving files"
 msgstr "ফাইল স�থানান�তর করা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1961
+#: libnautilus-private/nautilus-file-operations.c:1944
+#, fuzzy
 msgid "Moving file:"
-msgstr "যেসব ফাইল স�থানান�তর করা হচ�ছে:"
+msgstr "ফাইল স�থানান�তর করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1964
+#: libnautilus-private/nautilus-file-operations.c:1947
 msgid "Preparing To Move..."
 msgstr "স�থানান�তরের জন�য প�রস�ত�তি নেয়া হচ�ছে..."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1948
 msgid "Finishing Move..."
 msgstr "স�থানান�তর প�রক�রিয়া শেষ হচ�ছে..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1973
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Creating links to files"
 msgstr "বিভিন�ন ফাইলকে নির�দেশ করে লিঙ�ক তৈরি করা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1975
+#: libnautilus-private/nautilus-file-operations.c:1958
+#, fuzzy
 msgid "Linking file:"
-msgstr "�সব ফাইলের লিঙ�ক তৈরি করা হচ�ছে:"
+msgstr "লিঙ�ক তৈরি করা হচ�ছে"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1977
+#: libnautilus-private/nautilus-file-operations.c:1960
 msgid "Linking"
 msgstr "লিঙ�ক তৈরি করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1961
 msgid "Preparing to Create Links..."
 msgstr "লিঙ�ক তৈরির জন�য প�রস�ত�তি নেওয়া হচ�ছে..."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:1962
 msgid "Finishing Creating Links..."
 msgstr "লিঙ�ক তৈরির প�রক�রিয়া শেষ হচ�ছে..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1985
+#: libnautilus-private/nautilus-file-operations.c:1968
 msgid "Copying files"
 msgstr "ফাইল কপি করা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1987
+#: libnautilus-private/nautilus-file-operations.c:1970
+#, fuzzy
 msgid "Copying file:"
-msgstr "�সব ফাইল কপি করা হচ�ছে:"
+msgstr "ফাইল কপি করা হচ�ছে"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1989
+#: libnautilus-private/nautilus-file-operations.c:1972
 msgid "Copying"
 msgstr "কপি করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1990
+#: libnautilus-private/nautilus-file-operations.c:1973
 msgid "Preparing To Copy..."
 msgstr "কপি করার জন�য প�রস�ত�তি নেওয়া হচ�ছে.."
 
-#: libnautilus-private/nautilus-file-operations.c:2008
+#: libnautilus-private/nautilus-file-operations.c:1991
 msgid "You cannot copy items into the trash."
 msgstr "আবর�জনার বাক�সে কোন কিছ� কপি করতে পারবেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:2009
+#: libnautilus-private/nautilus-file-operations.c:1992
 msgid "You cannot create links inside the trash."
 msgstr "আবর�জনার বাক�সে কোন লিঙ�ক তৈরি করতে পারবেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:2010
+#: libnautilus-private/nautilus-file-operations.c:1993
 msgid "Files and folders can only be moved into the trash."
 msgstr "শ�ধ�মাত�র ফাইল ও ফোল�ডারকেই আবর�জনার বাক�সে স�থানান�তর করা যায়।"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
+#: libnautilus-private/nautilus-file-operations.c:2017
 msgid "You cannot move this trash folder."
 msgstr "আবর�জনার বাক�স হিসেবে ব�যবহৃত �ই ফোল�ডারটিকে আপনি স�থানান�তর করতে পারবেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:2035
+#: libnautilus-private/nautilus-file-operations.c:2018
 msgid "You cannot copy this trash folder."
 msgstr "আবর�জনার বাক�স হিসেবে ব�যবহৃত �ই ফোল�ডারটিকে আপনি কপি করতে পারবেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:2036
+#: libnautilus-private/nautilus-file-operations.c:2019
 msgid "A trash folder is used for storing items moved to the trash."
 msgstr ""
 "যে সব জিনিষকে আবর�জনার বাক�সে ফেলে দেওয়া হয় তাদেরকেই আবর�জনা ফোল�ডারে রাখা হয়।"
 
-#: libnautilus-private/nautilus-file-operations.c:2038
+#: libnautilus-private/nautilus-file-operations.c:2021
 msgid "Can't Change Trash Location"
 msgstr "আবর�জনার বাক�সের অবস�থান পরিবর�তন করা যাচ�ছে না"
 
-#: libnautilus-private/nautilus-file-operations.c:2039
+#: libnautilus-private/nautilus-file-operations.c:2022
 msgid "Can't Copy Trash"
 msgstr "আবর�জনার বাক�সকে কপি করা যাচ�ছে না"
 
-#: libnautilus-private/nautilus-file-operations.c:2063
+#: libnautilus-private/nautilus-file-operations.c:2046
 msgid "You cannot move a folder into itself."
 msgstr "কোন ফোল�ডারকে আপনি তার নিজের ভেতরেই স�থানান�তর করতে পারেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:2064
+#: libnautilus-private/nautilus-file-operations.c:2047
 msgid "You cannot copy a folder into itself."
 msgstr "কোন ফোল�ডারকে আপনি তার নিজের ভেতরেই কপি করতে পারেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:2065
+#: libnautilus-private/nautilus-file-operations.c:2048
 msgid "The destination folder is inside the source folder."
 msgstr "গন�তব�য ফোল�ডারের অবস�থান উত��স ফোল�ডারের ভেতরেরই।"
 
 # FIXME
-#: libnautilus-private/nautilus-file-operations.c:2067
+#: libnautilus-private/nautilus-file-operations.c:2050
 msgid "Can't Move Into Self"
 msgstr "নিজের ভেতরে স�থানান�তর করা যাচ�ছে না।"
 
 # FIXME
-#: libnautilus-private/nautilus-file-operations.c:2068
+#: libnautilus-private/nautilus-file-operations.c:2051
 msgid "Can't Copy Into Self"
 msgstr "নিজের ভেতরে কপি করা যাচ�ছে না।"
 
-#: libnautilus-private/nautilus-file-operations.c:2081
+#: libnautilus-private/nautilus-file-operations.c:2064
 msgid "You cannot copy a file over itself."
 msgstr "আপনি কোন ফাইলকে তার নিজ ওপরই কপি করতে পারেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:2082
+#: libnautilus-private/nautilus-file-operations.c:2065
 msgid "The destination and source are the same file."
 msgstr "উত��স ও গন�তব�য উভয়েই �কই ফাইল।"
 
-#: libnautilus-private/nautilus-file-operations.c:2083
+#: libnautilus-private/nautilus-file-operations.c:2066
 msgid "Can't Copy Over Self"
 msgstr "নিজের ওপর কপি করা যাচ�ছে না"
 
-#: libnautilus-private/nautilus-file-operations.c:2135
-#: libnautilus-private/nautilus-file-operations.c:2274
+#: libnautilus-private/nautilus-file-operations.c:2118
+#: libnautilus-private/nautilus-file-operations.c:2258
 msgid "You do not have permissions to write to the destination."
 msgstr "গন�তব�যস�থলে কোন কিছ� পরিবর�তনের অন�মতি আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:2137
-#: libnautilus-private/nautilus-file-operations.c:2276
+#: libnautilus-private/nautilus-file-operations.c:2120
+#: libnautilus-private/nautilus-file-operations.c:2260
 msgid "There is no space on the destination."
 msgstr "গন�তব�য ফোল�ডারে কোন স�থান ফা�কা নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:2139
+#: libnautilus-private/nautilus-file-operations.c:2122
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "নত�ন ফোল�ডার তৈরিতে \"%s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:2144
+#: libnautilus-private/nautilus-file-operations.c:2127
 msgid "Error creating new folder."
 msgstr "নত�ন ফোল�ডার তৈরিতে সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:2144
+#: libnautilus-private/nautilus-file-operations.c:2127
 msgid "Error Creating New Folder"
 msgstr "নত�ন ফোল�ডার তৈরিতে সমস�যা হয়েছে"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2239
+#: libnautilus-private/nautilus-file-operations.c:2222
 msgid "untitled folder"
 msgstr "নামহীন ফোল�ডার"
 
-#: libnautilus-private/nautilus-file-operations.c:2278
+#: libnautilus-private/nautilus-file-operations.c:2262
 #, c-format
 msgid "Error \"%s\" creating new document."
 msgstr "নত�ন ডক�মেন�ট তৈরিতে \"%s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:2283
+#: libnautilus-private/nautilus-file-operations.c:2267
 msgid "Error creating new document."
 msgstr "নত�ন ডক�মেন�ট তৈরিতে সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:2283
+#: libnautilus-private/nautilus-file-operations.c:2267
 msgid "Error Creating New Document"
 msgstr "নত�ন ডক�মেন�ট তৈরিতে সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-file-operations.c:2505
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "new file"
 msgstr "নত�ন ফাইল"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2570
+#: libnautilus-private/nautilus-file-operations.c:2486
 msgid "Deleting files"
 msgstr "ফাইল ম�ছে ফেলা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2572
-#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2488
+#: libnautilus-private/nautilus-file-operations.c:2523
 msgid "Files deleted:"
 msgstr "যে সব ফাইল ম�ছে ফেলা হয়েছে:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2574
-#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2490
+#: libnautilus-private/nautilus-file-operations.c:2525
 msgid "Deleting"
 msgstr "ম�ছে ফেলা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:2575
+#: libnautilus-private/nautilus-file-operations.c:2491
 msgid "Preparing to Delete files..."
 msgstr "ফাইল ম�ছে ফেলার জন�য প�রস�ত�তি নেওয়া হচ�ছে..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2521
 msgid "Emptying the Trash"
 msgstr "আবর�জনার বাক�স খালি করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2526
 msgid "Preparing to Empty the Trash..."
 msgstr "আবর�জনার বাক�স খালি করার জন�য প�রস�ত�তি নেওয়া হচ�ছে..."
 
-#: libnautilus-private/nautilus-file-operations.c:2646
+#: libnautilus-private/nautilus-file-operations.c:2562
+#, fuzzy
 msgid "Empty all of the items from the trash?"
 msgstr "আপনি কি আবর�জনার বাক�সের সব কিছ� স�থায়ীভাবে ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
 
-#: libnautilus-private/nautilus-file-operations.c:2649
+#: libnautilus-private/nautilus-file-operations.c:2565
+#, fuzzy
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
-msgstr ""
-"আবর�জনার বাক�য খালি করলে �র অভন�ত�যরস�থ জিনিষপত�র স�থায়ীভাবে ম�ছে যাবে।অন�গ�রহপূর�বক লক�ষ "
-"কর�ন যে, আপনি �দেরকে পৃথকভাবেও অপসারণ করতে পারেন।"
+msgstr "আবর�জনার বাক�য খালি করলে �র অভন�ত�যরস�থ জিনিষপত�র স�থায়ীভাবে ম�ছে যাবে।"
 
-#: libnautilus-private/nautilus-file-operations.c:2671
+#. name, stock id
+#: libnautilus-private/nautilus-file-operations.c:2587
+#: src/file-manager/fm-directory-view.c:5767
+#: src/file-manager/fm-directory-view.c:6314
 msgid "_Empty Trash"
 msgstr "আবর�জনার বাক�স খালি করো (_খ)"
 
-#: libnautilus-private/nautilus-file-utilities.c:480
-#: libnautilus-private/nautilus-global-preferences.c:512
+#: libnautilus-private/nautilus-file-utilities.c:442
+#: libnautilus-private/nautilus-global-preferences.c:534
 #: nautilus-computer.desktop.in.h:1
 msgid "Computer"
 msgstr "কম�পিউটার"
 
-#: libnautilus-private/nautilus-file-utilities.c:482
+#: libnautilus-private/nautilus-file-utilities.c:444
 msgid "Network"
 msgstr "নেটওয়ার�ক"
 
-#: libnautilus-private/nautilus-file-utilities.c:484
+#: libnautilus-private/nautilus-file-utilities.c:446
 msgid "Fonts"
 msgstr "ফন�ট"
 
-#: libnautilus-private/nautilus-file-utilities.c:486
+#: libnautilus-private/nautilus-file-utilities.c:448
 msgid "Themes"
-msgstr "থিম"
+msgstr "থীম"
 
-#: libnautilus-private/nautilus-file-utilities.c:488
+#: libnautilus-private/nautilus-file-utilities.c:450
 msgid "CD/DVD Creator"
-msgstr "সিডি/ডিভিডি প�রস�ত�তকারক"
+msgstr "সিডি/ডিভিডি তৈরিকারক"
 
-#: libnautilus-private/nautilus-file-utilities.c:490
+#: libnautilus-private/nautilus-file-utilities.c:452
 msgid "Windows Network"
-msgstr "উইন�ডোজ নেটওয়ার�ক"
+msgstr "উইন�ডোস নেটওয়ার�ক"
 
-# FIXME
-#. translators: this is the title of the "dns-sd:///" location
-#: libnautilus-private/nautilus-file-utilities.c:493
+#: libnautilus-private/nautilus-file-utilities.c:454
 msgid "Services in"
-msgstr "সার�ভিস"
+msgstr ""
 
 #. Today, use special word.
 #. * strftime patterns preceeded with the widest
@@ -2003,65 +2164,65 @@ msgstr "সার�ভিস"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2944
+#: libnautilus-private/nautilus-file.c:2965
 msgid "today at 00:00:00 PM"
 msgstr "আজ অপরাহ�ণ ০০:০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2945
+#: libnautilus-private/nautilus-file.c:2966
 #: src/nautilus-file-management-properties.c:493
 msgid "today at %-I:%M:%S %p"
 msgstr "আজ %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2947
+#: libnautilus-private/nautilus-file.c:2968
 msgid "today at 00:00 PM"
 msgstr "আজ অপরাহ�ণ ০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2948
+#: libnautilus-private/nautilus-file.c:2969
 msgid "today at %-I:%M %p"
 msgstr "আজ %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2950
+#: libnautilus-private/nautilus-file.c:2971
 msgid "today, 00:00 PM"
 msgstr "আজ, অপরাহ�ণ ০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2951
+#: libnautilus-private/nautilus-file.c:2972
 msgid "today, %-I:%M %p"
 msgstr "আজ, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2953
-#: libnautilus-private/nautilus-file.c:2954
+#: libnautilus-private/nautilus-file.c:2974
+#: libnautilus-private/nautilus-file.c:2975
 msgid "today"
 msgstr "আজ"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2963
+#: libnautilus-private/nautilus-file.c:2984
 msgid "yesterday at 00:00:00 PM"
 msgstr "গতকাল অপরাহ�ণ ০০:০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2964
+#: libnautilus-private/nautilus-file.c:2985
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "গতকাল %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2966
+#: libnautilus-private/nautilus-file.c:2987
 msgid "yesterday at 00:00 PM"
 msgstr "গতকাল অপরাহ�ণ ০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2967
+#: libnautilus-private/nautilus-file.c:2988
 msgid "yesterday at %-I:%M %p"
 msgstr "গতকাল %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2969
+#: libnautilus-private/nautilus-file.c:2990
 msgid "yesterday, 00:00 PM"
 msgstr "গতকাল, অপরাহ�ণ ০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2970
+#: libnautilus-private/nautilus-file.c:2991
 msgid "yesterday, %-I:%M %p"
 msgstr "গতকাল, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2972
-#: libnautilus-private/nautilus-file.c:2973
+#: libnautilus-private/nautilus-file.c:2993
+#: libnautilus-private/nautilus-file.c:2994
 msgid "yesterday"
 msgstr "গতকাল"
 
@@ -2070,78 +2231,78 @@ msgstr "গতকাল"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2984
+#: libnautilus-private/nautilus-file.c:3005
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "ব�ধবার, সেপ�টেম�বর ০০ ০০০০ অপরাহ�ণ ০০:০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2985
+#: libnautilus-private/nautilus-file.c:3006
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y সময় %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2987
+#: libnautilus-private/nautilus-file.c:3008
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "সোমবার, অক�টোবর ০০ ০০০০ অপরাহ�ণ ০০:০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2988
+#: libnautilus-private/nautilus-file.c:3009
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y সময় %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2990
+#: libnautilus-private/nautilus-file.c:3011
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "সোমবার, অক�টোবর ০০ ০০০০ অপরাহ�ণ ০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2991
+#: libnautilus-private/nautilus-file.c:3012
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y সময় %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2993
+#: libnautilus-private/nautilus-file.c:3014
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "অক�টোবর ০০ ০০০০ অপরাহ�ণ ০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2994
+#: libnautilus-private/nautilus-file.c:3015
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y সময় %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2996
+#: libnautilus-private/nautilus-file.c:3017
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "অক�টোবর ০০ ০০০০, অপরাহ�ণ ০০:০০"
 
-#: libnautilus-private/nautilus-file.c:2997
+#: libnautilus-private/nautilus-file.c:3018
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2999
+#: libnautilus-private/nautilus-file.c:3020
 msgid "00/00/00, 00:00 PM"
 msgstr "০০/০০/০০, অপরাহ�ণ ০০:০০"
 
-#: libnautilus-private/nautilus-file.c:3000
+#: libnautilus-private/nautilus-file.c:3021
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:3002
+#: libnautilus-private/nautilus-file.c:3023
 msgid "00/00/00"
 msgstr "০০/০০/০০"
 
-#: libnautilus-private/nautilus-file.c:3003
+#: libnautilus-private/nautilus-file.c:3024
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4294
-#: src/file-manager/fm-directory-view.c:1933
+#: libnautilus-private/nautilus-file.c:4315
+#: src/file-manager/fm-directory-view.c:1859
 #, c-format
 msgid "%u item"
 msgid_plural "%u items"
 msgstr[0] "%uটি জিনিষ"
 msgstr[1] "%uটি জিনিষ"
 
-#: libnautilus-private/nautilus-file.c:4295
+#: libnautilus-private/nautilus-file.c:4316
 #, c-format
 msgid "%u folder"
 msgid_plural "%u folders"
 msgstr[0] "%uটি ফোল�ডার"
 msgstr[1] "%uটি ফোল�ডার"
 
-#: libnautilus-private/nautilus-file.c:4296
+#: libnautilus-private/nautilus-file.c:4317
 #, c-format
 msgid "%u file"
 msgid_plural "%u files"
@@ -2149,37 +2310,37 @@ msgstr[0] "%uটি ফাইল"
 msgstr[1] "%uটি ফাইল"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4621
-#: libnautilus-private/nautilus-file.c:4637
+#: libnautilus-private/nautilus-file.c:4642
+#: libnautilus-private/nautilus-file.c:4658
 msgid "? items"
-msgstr "?টি ফাইল/ফোল�ডার"
+msgstr "?টি জিনিষ"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4627
+#: libnautilus-private/nautilus-file.c:4648
 msgid "? bytes"
 msgstr "? বাইট"
 
-#: libnautilus-private/nautilus-file.c:4642
+#: libnautilus-private/nautilus-file.c:4663
 msgid "unknown type"
 msgstr "অজ�ঞাত প�রকৃতি"
 
-#: libnautilus-private/nautilus-file.c:4645
+#: libnautilus-private/nautilus-file.c:4666
 msgid "unknown MIME type"
 msgstr "অজ�ঞাত মাইম প�রকৃতি"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4651
-#: src/file-manager/fm-properties-window.c:1306
+#: libnautilus-private/nautilus-file.c:4672
+#: src/file-manager/fm-properties-window.c:1218
 msgid "unknown"
 msgstr "অজ�ঞাত"
 
-#: libnautilus-private/nautilus-file.c:4684
+#: libnautilus-private/nautilus-file.c:4705
 msgid "program"
 msgstr "প�রোগ�রাম"
 
-#: libnautilus-private/nautilus-file.c:4702
+#: libnautilus-private/nautilus-file.c:4723
 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 "
@@ -2189,7 +2350,7 @@ msgstr ""
 "ব�যবহৃত gnome-vfs.keys ফাইলটি �কটি ভ�ল স�থানে অবস�থান করছে অথবা অন�য কোন কারণে তা "
 "খ��জে পাওয়া যাচ�ছে না।"
 
-#: libnautilus-private/nautilus-file.c:4706
+#: libnautilus-private/nautilus-file.c:4727
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -2198,210 +2359,210 @@ msgstr ""
 "মাইম প�রকৃতি \"%s\"-�র ( ফাইল হল \"%s\" ) জন�য কোন বিবরণ পাওয়া যাচ�ছে না, "
 "অন�গ�রহপূর�বক gnome-vfs মেইলিং লিস�টে �ই সংবাদটি প�রেরণ কর�ন।"
 
-#: libnautilus-private/nautilus-file.c:4722
+#: libnautilus-private/nautilus-file.c:4743
 msgid "link"
 msgstr "লিঙ�ক"
 
-#: libnautilus-private/nautilus-file.c:4742
+#: libnautilus-private/nautilus-file.c:4763
 msgid "link (broken)"
 msgstr "লিঙ�ক ( অচল )"
 
-#: libnautilus-private/nautilus-file.c:6170
-#: libnautilus-private/nautilus-global-preferences.c:518
-#: libnautilus-private/nautilus-trash-directory.c:353
+#: libnautilus-private/nautilus-file.c:6191
+#: libnautilus-private/nautilus-global-preferences.c:540
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "আবর�জনার বাক�স"
 
-#: libnautilus-private/nautilus-global-preferences.c:70
+#: libnautilus-private/nautilus-global-preferences.c:100
 msgid "_Always"
 msgstr "সর�বদা (_স)"
 
-#: libnautilus-private/nautilus-global-preferences.c:71
+#: libnautilus-private/nautilus-global-preferences.c:101
 msgid "_Local File Only"
 msgstr "শ�ধ�মাত�র স�থানীয় ফাইল (_ম)"
 
-#: libnautilus-private/nautilus-global-preferences.c:72
+#: libnautilus-private/nautilus-global-preferences.c:102
 msgid "_Never"
 msgstr "কখনো না (_ন)"
 
-#: libnautilus-private/nautilus-global-preferences.c:78
+#: libnautilus-private/nautilus-global-preferences.c:108
 #: src/nautilus-file-management-properties.glade.h:14
 #, no-c-format
 msgid "25%"
 msgstr "২৫%"
 
-#: libnautilus-private/nautilus-global-preferences.c:80
+#: libnautilus-private/nautilus-global-preferences.c:110
 #: src/nautilus-file-management-properties.glade.h:20
 #, no-c-format
 msgid "50%"
 msgstr "৫০%"
 
-#: libnautilus-private/nautilus-global-preferences.c:82
+#: libnautilus-private/nautilus-global-preferences.c:112
 #: src/nautilus-file-management-properties.glade.h:23
 #, no-c-format
 msgid "75%"
 msgstr "৭৫%"
 
-#: libnautilus-private/nautilus-global-preferences.c:84
+#: libnautilus-private/nautilus-global-preferences.c:114
 #: src/nautilus-file-management-properties.glade.h:8
 #, no-c-format
 msgid "100%"
 msgstr "১০০%"
 
-#: libnautilus-private/nautilus-global-preferences.c:86
+#: libnautilus-private/nautilus-global-preferences.c:116
 #: src/nautilus-file-management-properties.glade.h:10
 #, no-c-format
 msgid "150%"
 msgstr "১৫০%"
 
-#: libnautilus-private/nautilus-global-preferences.c:88
+#: libnautilus-private/nautilus-global-preferences.c:118
 #: src/nautilus-file-management-properties.glade.h:12
 #, no-c-format
 msgid "200%"
 msgstr "২০০%"
 
-#: libnautilus-private/nautilus-global-preferences.c:90
+#: libnautilus-private/nautilus-global-preferences.c:120
 #: src/nautilus-file-management-properties.glade.h:17
 #, no-c-format
 msgid "400%"
 msgstr "৪০০%"
 
-#: libnautilus-private/nautilus-global-preferences.c:95
+#: libnautilus-private/nautilus-global-preferences.c:125
 msgid "100 K"
 msgstr "১০০ কিলোবাইট"
 
-#: libnautilus-private/nautilus-global-preferences.c:96
+#: libnautilus-private/nautilus-global-preferences.c:126
 msgid "500 K"
 msgstr "৫০০ কিলোবাইট"
 
-#: libnautilus-private/nautilus-global-preferences.c:97
+#: libnautilus-private/nautilus-global-preferences.c:127
 #: src/nautilus-file-management-properties.glade.h:3
 msgid "1 MB"
 msgstr "১ মেগাবাইট"
 
-#: libnautilus-private/nautilus-global-preferences.c:98
+#: libnautilus-private/nautilus-global-preferences.c:128
 #: src/nautilus-file-management-properties.glade.h:15
 msgid "3 MB"
 msgstr "৩ মেগাবাইট"
 
-#: libnautilus-private/nautilus-global-preferences.c:99
+#: libnautilus-private/nautilus-global-preferences.c:129
 #: src/nautilus-file-management-properties.glade.h:18
 msgid "5 MB"
 msgstr "৫ মেগাবাইট"
 
-#: libnautilus-private/nautilus-global-preferences.c:100
+#: libnautilus-private/nautilus-global-preferences.c:130
 #: src/nautilus-file-management-properties.glade.h:4
 msgid "10 MB"
 msgstr "১০ মেগাবাইট"
 
-#: libnautilus-private/nautilus-global-preferences.c:101
+#: libnautilus-private/nautilus-global-preferences.c:131
 #: src/nautilus-file-management-properties.glade.h:6
 msgid "100 MB"
 msgstr "১০০ মেগাবাইট"
 
-#: libnautilus-private/nautilus-global-preferences.c:107
+#: libnautilus-private/nautilus-global-preferences.c:137
 msgid "Activate items with a _single click"
 msgstr "�কবার ক�লিকের সাহায�যে সক�রিয় করা হবে (_ক)"
 
-#: libnautilus-private/nautilus-global-preferences.c:111
+#: libnautilus-private/nautilus-global-preferences.c:141
 msgid "Activate items with a _double click"
 msgstr "দ�বার ক�লিক করে সক�রিয় করা হবে (_স)"
 
-#: libnautilus-private/nautilus-global-preferences.c:119
+#: libnautilus-private/nautilus-global-preferences.c:149
 msgid "E_xecute files when they are clicked"
 msgstr "কোন ফাইলে ক�লিক করা হলে তা �ক�সিকিউট করা হবে (_ল)"
 
-#: libnautilus-private/nautilus-global-preferences.c:123
+#: libnautilus-private/nautilus-global-preferences.c:153
 msgid "Display _files when they are clicked"
 msgstr "কোন ফাইলে ক�লিক করা হলে তা প�রদর�শন করা হবে (_ফ)"
 
-#: libnautilus-private/nautilus-global-preferences.c:127
+#: libnautilus-private/nautilus-global-preferences.c:157
 #: src/nautilus-file-management-properties.glade.h:70
 msgid "_Ask each time"
 msgstr "প�রতিবার জিজ�ঞাসা করা হবে (_ব)"
 
-#: libnautilus-private/nautilus-global-preferences.c:135
+#: libnautilus-private/nautilus-global-preferences.c:165
 msgid "Search for files by file name only"
 msgstr "শ�ধ�মাত�র নাম ব�যবহার করে ফাইল খো�জো"
 
-#: libnautilus-private/nautilus-global-preferences.c:139
+#: libnautilus-private/nautilus-global-preferences.c:169
 msgid "Search for files by file name and file properties"
 msgstr "ফাইলের নাম ও বৈশিষ�ট�য ব�যবহার করে ফাইল খো�জো"
 
-#: libnautilus-private/nautilus-global-preferences.c:146
-#: src/file-manager/fm-icon-container.c:500
+#: libnautilus-private/nautilus-global-preferences.c:176
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:54
 msgid "Icon View"
 msgstr "আইকন দৃশ�য"
 
-#: libnautilus-private/nautilus-global-preferences.c:147
-#: src/file-manager/fm-list-view.c:1475
+#: libnautilus-private/nautilus-global-preferences.c:177
+#: src/file-manager/fm-list-view.c:1160
 #: src/nautilus-file-management-properties.glade.h:56
 msgid "List View"
 msgstr "তালিকা দৃশ�য"
 
-#: libnautilus-private/nautilus-global-preferences.c:152
+#: libnautilus-private/nautilus-global-preferences.c:182
 msgid "Manually"
 msgstr "নিজ হাতে"
 
-#: libnautilus-private/nautilus-global-preferences.c:154
+#: libnautilus-private/nautilus-global-preferences.c:184
 #: src/nautilus-file-management-properties.glade.h:44
 msgid "By Name"
 msgstr "নামান�সারে"
 
-#: libnautilus-private/nautilus-global-preferences.c:155
+#: libnautilus-private/nautilus-global-preferences.c:185
 #: src/nautilus-file-management-properties.glade.h:45
 msgid "By Size"
 msgstr "আকারান�সারে"
 
-#: libnautilus-private/nautilus-global-preferences.c:156
+#: libnautilus-private/nautilus-global-preferences.c:186
 #: src/nautilus-file-management-properties.glade.h:46
 msgid "By Type"
 msgstr "ধরন অন�সারে"
 
-#: libnautilus-private/nautilus-global-preferences.c:157
+#: libnautilus-private/nautilus-global-preferences.c:187
 #: src/nautilus-file-management-properties.glade.h:43
 msgid "By Modification Date"
 msgstr "সর�বশেষ পরিবর�তনের তারিখ অন�সারে"
 
-#: libnautilus-private/nautilus-global-preferences.c:158
+#: libnautilus-private/nautilus-global-preferences.c:188
 #: src/nautilus-file-management-properties.glade.h:42
 msgid "By Emblems"
 msgstr "প�রতীক অন�সারে"
 
-#: libnautilus-private/nautilus-global-preferences.c:163
+#: libnautilus-private/nautilus-global-preferences.c:193
 msgid "8"
 msgstr "৮"
 
-#: libnautilus-private/nautilus-global-preferences.c:164
+#: libnautilus-private/nautilus-global-preferences.c:194
 msgid "10"
 msgstr "১০"
 
-#: libnautilus-private/nautilus-global-preferences.c:165
+#: libnautilus-private/nautilus-global-preferences.c:195
 msgid "12"
 msgstr "১২"
 
-#: libnautilus-private/nautilus-global-preferences.c:166
+#: libnautilus-private/nautilus-global-preferences.c:196
 msgid "14"
 msgstr "১৪"
 
-#: libnautilus-private/nautilus-global-preferences.c:167
+#: libnautilus-private/nautilus-global-preferences.c:197
 msgid "16"
 msgstr "১৬"
 
-#: libnautilus-private/nautilus-global-preferences.c:168
+#: libnautilus-private/nautilus-global-preferences.c:198
 msgid "18"
 msgstr "১৮"
 
-#: libnautilus-private/nautilus-global-preferences.c:169
+#: libnautilus-private/nautilus-global-preferences.c:199
 msgid "20"
 msgstr "২০"
 
-#: libnautilus-private/nautilus-global-preferences.c:170
+#: libnautilus-private/nautilus-global-preferences.c:200
 msgid "22"
 msgstr "২২"
 
-#: libnautilus-private/nautilus-global-preferences.c:171
+#: libnautilus-private/nautilus-global-preferences.c:201
 msgid "24"
 msgstr "২৪"
 
@@ -2413,28 +2574,155 @@ msgstr "২৪"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: libnautilus-private/nautilus-global-preferences.c:506
+#: libnautilus-private/nautilus-global-preferences.c:528
 #, c-format
 msgid "%s's Home"
 msgstr "%s-�র ব�যক�তিগত ফোল�ডার"
 
-#: libnautilus-private/nautilus-icon-container.c:2119
+#: libnautilus-private/nautilus-icon-canvas-item.c:2892
+msgid "editable text"
+msgstr "সম�পাদনযোগ�য টেক�সট"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2893
+msgid "the editable label"
+msgstr "পরিবর�তনযোগ�য লেবেল"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2900
+msgid "additional text"
+msgstr "অতিরিক�ত টেক�সট"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2901
+msgid "some more text"
+msgstr "আরো কিছ� টেক�সট"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2908
+msgid "highlighted for selection"
+msgstr "বাছাইয়ের উদ�দেশ�যে চিহ�নিত"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2909
+msgid "whether we are highlighted for a selection"
+msgstr "বাছাইয়ের উদ�দেশ�যে আমরা চিহ�নিত হয়েছি কিনা"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2916
+msgid "highlighted as keyboard focus"
+msgstr "কীবোর�ড ইনপ�টের লক�ষ�য হিসেবে নির�ধারিত"
+
+# FIXME
+#: libnautilus-private/nautilus-icon-canvas-item.c:2917
+msgid "whether we are highlighted to render keyboard focus"
+msgstr "কীবোর�ড ইনপ�টের লক�ষ�য হিসেবে আমরা নির�ধারিত হয়েছি কিনা"
+
+# FIXME
+#: libnautilus-private/nautilus-icon-canvas-item.c:2925
+msgid "highlighted for drop"
+msgstr "স�থানান�তরের জন�য চিহ�নিত"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2926
+msgid "whether we are highlighted for a D&D drop"
+msgstr "টেনে �নে রেখে দেয়ার জন�য আমরা চিহ�নিত হয়েছি কিনা"
+
+#: libnautilus-private/nautilus-icon-container.c:2107
 msgid "The selection rectangle"
 msgstr "চিহ�নিত করার কাজে ব�যবহৃত চত�র�ভূজ"
 
-#: libnautilus-private/nautilus-icon-container.c:4323
-msgid "Normal Alpha"
-msgstr "স�বাভাবিক আলফা"
+#: libnautilus-private/nautilus-icon-container.c:4254
+msgid "Frame Text"
+msgstr "ফ�রেম টেক�সট"
+
+#: libnautilus-private/nautilus-icon-container.c:4255
+msgid "Draw a frame around unselected text"
+msgstr "যে সব টেক�সট চিহ�নিত করা হয় নি তার চারদিকে �কটি ফ�রেম আ�ক�ন"
+
+#: libnautilus-private/nautilus-icon-container.c:4261
+msgid "Selection Box Color"
+msgstr "বাছাইকারী বাক�সের রং"
+
+#: libnautilus-private/nautilus-icon-container.c:4262
+msgid "Color of the selection box"
+msgstr "বাছাইকারী বাক�সের রং"
+
+#: libnautilus-private/nautilus-icon-container.c:4267
+msgid "Selection Box Alpha"
+msgstr "বাছাইকারী বাক�স আলফা"
+
+#: libnautilus-private/nautilus-icon-container.c:4268
+msgid "Opacity of the selection box"
+msgstr "বাছাইকারী বাক�সের অস�বচ�ছতা"
+
+#: libnautilus-private/nautilus-icon-container.c:4275
+msgid "Highlight Alpha"
+msgstr "আলফাকে চিহ�নিত করো"
 
-#: libnautilus-private/nautilus-icon-container.c:4324
-msgid "Opacity of the normal icons if frame_text is set"
-msgstr "frame_text ব�যবহার করা হলে সাধারণ আইকনের স�বচ�ছতা"
+# FIXME: �টা মনে হয় ভ�ল হইছে
+#: libnautilus-private/nautilus-icon-container.c:4276
+msgid "Opacity of the highlight for selected icons"
+msgstr "আইকন চিহ�নিত করার ক�ষেত�রে অস�বচ�ছতা"
 
-#: libnautilus-private/nautilus-icon-dnd.c:790
+# FIXME
+#: libnautilus-private/nautilus-icon-container.c:4282
+msgid "Light Info Color"
+msgstr "হালকা রঙে প�রদর�শিত তথ�যের রং"
+
+#: libnautilus-private/nautilus-icon-container.c:4283
+msgid "Color used for information text against a dark background"
+msgstr "গা� পটভূমির প�রেক�ষাপটে তথ�য প�রদর�শনে ব�যবহৃত রং"
+
+#: libnautilus-private/nautilus-icon-container.c:4288
+msgid "Dark Info Color"
+msgstr "গা� রঙে প�রদর�শিত তথ�যের রং"
+
+#: libnautilus-private/nautilus-icon-container.c:4289
+msgid "Color used for information text against a light background"
+msgstr "হালকা পটভূমির প�রেক�ষাপটে তথ�য প�রদর�শনে ব�যবহৃত রং"
+
+# FIXME: Clobber-�র ব�যাপারটা বো�া যাচ�ছে না ;-(
+#: libnautilus-private/nautilus-icon-dnd.c:754
+msgid ""
+"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-private/nautilus-icon-dnd.c:756
+#: libnautilus-private/nautilus-icon-dnd.c:760
+#: libnautilus-private/nautilus-icon-dnd.c:765
+#: libnautilus-private/nautilus-icon-dnd.c:768
+msgid "This folder uses automatic layout."
+msgstr "�ই ফোল�ডারে স�বয়ংক�রিয়ভাবে আইকন সাজানো হয়।"
+
+# FIXME: Clobber-�র ব�যাপারটা বো�া যাচ�ছে না ;-(
+#: libnautilus-private/nautilus-icon-dnd.c:758
+msgid ""
+"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-private/nautilus-icon-dnd.c:764
+msgid ""
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
+msgstr ""
+"আপনি কি নিজ হাতে আইকন সাজাতে আগ�রহী �বং আপনি কি �ই জিনিষটি যেখানে রেখেছেন "
+"সেখানেই রাখতে চান?  "
+
+#: libnautilus-private/nautilus-icon-dnd.c:767
+msgid ""
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
+msgstr ""
+"আপনি কি নিজ হাতে আইকন সাজাতে আগ�রহী �বং �ই জিনিষগ�লো যেখানে রেখেছেন সেখানেই "
+"রাখতে চান?  "
+
+#: libnautilus-private/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "নিজ হাতে আইকন সাজাতে চান?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:791
+#: libnautilus-private/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "পরিবর�তন"
 
@@ -2517,113 +2805,114 @@ msgstr "\"%s\" খোলা হচ�ছে"
 #: libnautilus-private/nautilus-program-choosing.c:591
 #: libnautilus-private/nautilus-program-choosing.c:599
 #: libnautilus-private/nautilus-program-choosing.c:604
-#: src/nautilus-window-manage-views.c:1358
-#: src/nautilus-window-manage-views.c:1364
+#: src/nautilus-window-manage-views.c:1344
+#: src/nautilus-window-manage-views.c:1350
+#: src/nautilus-window-manage-views.c:1378
+#: src/nautilus-window-manage-views.c:1386
 #: src/nautilus-window-manage-views.c:1392
-#: src/nautilus-window-manage-views.c:1400
-#: src/nautilus-window-manage-views.c:1406
-#: src/nautilus-window-manage-views.c:1427
+#: src/nautilus-window-manage-views.c:1413
 #, c-format
 msgid "Couldn't display \"%s\"."
 msgstr "\"%s\" প�রদর�শন করা যাচ�ছে না।"
 
 #: libnautilus-private/nautilus-program-choosing.c:593
-#: libnautilus-private/nautilus-program-choosing.c:890
-#: libnautilus-private/nautilus-program-choosing.c:961
+#: libnautilus-private/nautilus-program-choosing.c:888
+#: libnautilus-private/nautilus-program-choosing.c:957
 msgid "There was an error launching the application."
 msgstr "অ�যাপলিকেশনটি চালাতে গিয়ে �কটি সমস�যা হয়েছে।"
 
 #: libnautilus-private/nautilus-program-choosing.c:601
-#: src/nautilus-window-manage-views.c:1402
+#: src/nautilus-window-manage-views.c:1388
 msgid "The attempt to log in failed."
 msgstr "লগ-ইন-�র প�রচেষ�টা ব�যর�থ হয়েছে।"
 
 #: libnautilus-private/nautilus-program-choosing.c:606
-#: src/nautilus-window-manage-views.c:1408
+#: src/nautilus-window-manage-views.c:1394
 msgid "Access was denied."
 msgstr "প�রবেশাধিকার প�রত�যাখ�যাত হয়েছে।"
 
 #: libnautilus-private/nautilus-program-choosing.c:611
-#: src/nautilus-window-manage-views.c:1419
+#: src/nautilus-window-manage-views.c:1405
 #, c-format
 msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "\"%s\" নামক হোস�টকে খ��জে না পাওয়ায় \"%s\"-কে প�রদর�শন করা যায় নি।"
 
 #: libnautilus-private/nautilus-program-choosing.c:614
-#: src/nautilus-window-manage-views.c:1422
+#: src/nautilus-window-manage-views.c:1408
 msgid ""
 "Check that the spelling is correct and that your proxy settings are correct."
 msgstr "বানান �বং প�রক�সির বৈশিষ�ট�যাবলী ঠিক আছে কিনা তা পরীক�ষা কর�ন।"
 
 #: libnautilus-private/nautilus-program-choosing.c:619
-#: src/nautilus-connect-server-dialog.c:142
-#: src/nautilus-window-manage-views.c:1380
+#: src/nautilus-connect-server-dialog.c:140
+#: src/nautilus-window-manage-views.c:1366
 #, c-format
 msgid "\"%s\" is not a valid location."
 msgstr "\"%s\" কোন বৈধ অবস�থান নয়।"
 
 #: libnautilus-private/nautilus-program-choosing.c:622
 #: libnautilus-private/nautilus-program-choosing.c:629
-#: src/nautilus-connect-server-dialog.c:144
-#: src/nautilus-property-browser.c:1152
-#: src/nautilus-window-manage-views.c:1375
-#: src/nautilus-window-manage-views.c:1383
+#: src/nautilus-connect-server-dialog.c:142
+#: src/nautilus-property-browser.c:1097
+#: src/nautilus-window-manage-views.c:1361
+#: src/nautilus-window-manage-views.c:1369
 msgid "Please check the spelling and try again."
 msgstr "অন�গ�রহপূর�বক বানান ঠিক আছে কিনা তা পরীক�ষা কর�ন �বং তারপর প�নরায় চেষ�টা কর�ন।"
 
 #: libnautilus-private/nautilus-program-choosing.c:626
-#: src/nautilus-window-manage-views.c:1372
+#: src/nautilus-window-manage-views.c:1358
 #, c-format
 msgid "Couldn't find \"%s\"."
 msgstr "\"%s\" পাওয়া যায় নি।"
 
 #: libnautilus-private/nautilus-program-choosing.c:644
-#: src/nautilus-connect-server-dialog-main.c:72
-#: src/nautilus-window-manage-views.c:1448
+#: src/nautilus-connect-server-dialog-main.c:71
+#: src/nautilus-window-manage-views.c:1434
 msgid "Can't Display Location"
 msgstr "অবস�থানটি দেখানো যাচ�ছে না"
 
-#: libnautilus-private/nautilus-program-choosing.c:875
+#: libnautilus-private/nautilus-program-choosing.c:873
 msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "দ�ঃখিত, দূরবর�তী সাইট থেকে আপনি কোন কমান�ড চালাতে পারবেন না।"
 
-#: libnautilus-private/nautilus-program-choosing.c:877
+#: libnautilus-private/nautilus-program-choosing.c:875
 msgid "This is disabled due to security considerations."
 msgstr "নিরাপত�তার কথা বিবেচনা করে �টি নিষ�ক�রিয় করা হয়েছে।"
 
-#: libnautilus-private/nautilus-program-choosing.c:878
+# FIXME:  অর�থ পরিষ�কার না
+#: libnautilus-private/nautilus-program-choosing.c:876
 msgid "Can't Execute Remote Links"
-msgstr "লিঙ�ক কর�তৃক নির�দেশিত দূরবর�তী কম�পিউটারের প�রোগ�রামকে চালানো যাচ�ছে না"
+msgstr "দূরবর�তী কম�পিউটারে অবস�থিত লিঙ�ক কর�তৃক নির�দেশিত প�রোগ�রামকে চালানো যাচ�ছে না"
 
-#: libnautilus-private/nautilus-program-choosing.c:888
-#: libnautilus-private/nautilus-program-choosing.c:959
+#: libnautilus-private/nautilus-program-choosing.c:886
+#: libnautilus-private/nautilus-program-choosing.c:955
 msgid "Details: "
 msgstr "বিস�তারিত: "
 
-#: libnautilus-private/nautilus-program-choosing.c:892
-#: libnautilus-private/nautilus-program-choosing.c:963
+#: libnautilus-private/nautilus-program-choosing.c:890
+#: libnautilus-private/nautilus-program-choosing.c:959
 msgid "Error Launching Application"
 msgstr "অ�যাপলিকেশন চাল� করতে সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-program-choosing.c:920
-#: libnautilus-private/nautilus-program-choosing.c:932
+#: libnautilus-private/nautilus-program-choosing.c:918
+#: libnautilus-private/nautilus-program-choosing.c:930
 msgid "This drop target only supports local files."
 msgstr "টেনে �নে ফেলে দেওয়ার �ই প�রক�রিয়া শ�ধ�মাত�র স�থানীয় ফাইলের ক�ষেত�রে প�রযোজ�য।"
 
 # FIXME: ভাল শোনাচ�ছে না ;-(
-#: libnautilus-private/nautilus-program-choosing.c:921
+#: libnautilus-private/nautilus-program-choosing.c:919
 msgid ""
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "কোন অস�থানীয় ফাইলকে ব�যবহার করতে হলে তা কপি করে স�থানীয় কোন ফোল�ডারে আন�ন ও তারপর "
 "প�নরায় টেনে �নে ফেলে দিন।"
 
-#: libnautilus-private/nautilus-program-choosing.c:923
-#: libnautilus-private/nautilus-program-choosing.c:935
+#: libnautilus-private/nautilus-program-choosing.c:921
+#: libnautilus-private/nautilus-program-choosing.c:933
 msgid "Drop Target Only Supports Local Files"
 msgstr "টেনে �নে ফেলে দেয়ার প�রক�রিয়া শ�ধ�মাত�র স�থানীয় ফাইলের ক�ষেত�রে প�রযোজ�য"
 
-#: libnautilus-private/nautilus-program-choosing.c:933
+#: libnautilus-private/nautilus-program-choosing.c:931
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
@@ -2664,7 +2953,7 @@ msgstr "ফাইল ব�যবস�থাপনা পদ�ধতি পর
 msgid "File Management"
 msgstr "ফাইল ব�যবস�থাপনা"
 
-#: nautilus-home.desktop.in.h:1 src/file-manager/fm-tree-view.c:1243
+#: nautilus-home.desktop.in.h:1 src/file-manager/fm-tree-view.c:1252
 msgid "Home Folder"
 msgstr "ব�যক�তিগত ফোল�ডার"
 
@@ -2673,7 +2962,7 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "নটিলাস ফাইল ব�যবস�থাপকে আপনার ব�যক�তিগত ফোল�ডার দেখ�ন"
 
 #: nautilus.desktop.in.h:1
-msgid "Browse the file system with the file manager"
+msgid "Browse the filesystem with the file manager"
 msgstr "ফাইল ব�যবস�থাপকের সাহায�যে ফাইল-সিস�টেম ব�রাউজ কর�ন"
 
 #: nautilus.desktop.in.h:2
@@ -2706,104 +2995,93 @@ msgstr "নটিলাস শেলের যেসব কাজ কমানà§
 msgid "Produces metafile objects for accessing Nautilus metadata"
 msgstr "নটিলাস মেটাডাটা ব�যবহারের জন�য মেটাফাইল অবজেক�ট তৈরি করে"
 
-#: src/file-manager/fm-desktop-icon-view.c:617
+#: src/file-manager/fm-desktop-icon-view.c:625
 msgid "Background"
 msgstr "পটভূমি"
 
-#. name, stock id
-#: src/file-manager/fm-desktop-icon-view.c:680
-#: src/file-manager/fm-directory-view.c:6154
-#: src/file-manager/fm-directory-view.c:6841
+#: src/file-manager/fm-desktop-icon-view.c:686
+#, fuzzy
 msgid "E_mpty Trash"
-msgstr "আবর�জনার বাক�স ফা�কা করো (_ফ)"
+msgstr "আবর�জনার বাক�স ফা�কা করো"
+
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:696
+msgid "Open T_erminal"
+msgstr "টার�মিনাল খোলো (_ট)"
 
 #. label, accelerator
+#: src/file-manager/fm-desktop-icon-view.c:697
+msgid "Open a new GNOME terminal window"
+msgstr "�কটি নত�ন গনোম টার�মিনাল উইন�ডো চাল� করো"
+
 #. name, stock id
-#: src/file-manager/fm-desktop-icon-view.c:692
-#: src/file-manager/fm-directory-view.c:6126
-msgid "Create L_auncher..."
-msgstr "লঞ�চার তৈরি করো (_ল)..."
+#: src/file-manager/fm-desktop-icon-view.c:700
+#: src/file-manager/fm-directory-view.c:5739
+msgid "Create L_auncher"
+msgstr "নত�ন লঞ�চার তৈরি করো (_ল)"
 
-#. tooltip
 #. label, accelerator
-#: src/file-manager/fm-desktop-icon-view.c:694
-#: src/file-manager/fm-directory-view.c:6127
+#: src/file-manager/fm-desktop-icon-view.c:701
+#: src/file-manager/fm-directory-view.c:5740
 msgid "Create a new launcher"
 msgstr "�কটি নত�ন লঞ�চার তৈরি করো"
 
-#. label, accelerator
-#: src/file-manager/fm-desktop-icon-view.c:699
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:704
 msgid "Change Desktop _Background"
 msgstr "ডেস�কটপের পটভূমি পরিবর�তন করো"
 
-#. tooltip
-#: src/file-manager/fm-desktop-icon-view.c:701
+#. label, accelerator
+#: src/file-manager/fm-desktop-icon-view.c:705
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr "ডেস�কটপের পটভূমির বিন�যাস বা রং নির�ধারণী উইন�ডো প�রদর�শন করো"
 
-#. label, accelerator
-#: src/file-manager/fm-desktop-icon-view.c:706
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:708
 msgid "Empty Trash"
 msgstr "আবর�জনার বাক�স ফা�কা করো"
 
-#. tooltip
 #. label, accelerator
-#: src/file-manager/fm-desktop-icon-view.c:708
-#: src/file-manager/fm-directory-view.c:6155
+#: src/file-manager/fm-desktop-icon-view.c:709
+#: src/file-manager/fm-directory-view.c:5768
 msgid "Delete all items in the Trash"
 msgstr "আবর�জনার বাক�সের সব কিছ� ম�ছে ফেলো"
 
-#: src/file-manager/fm-desktop-icon-view.c:797
-#: src/nautilus-desktop-window.c:246 src/nautilus-pathbar.c:1130
-#: src/nautilus-pathbar.c:1134 src/nautilus-places-sidebar.c:161
+#: src/file-manager/fm-desktop-icon-view.c:798
+#: src/nautilus-desktop-window.c:365
 msgid "Desktop"
 msgstr "ডেস�কটপ"
 
-#: src/file-manager/fm-desktop-icon-view.c:798
-msgid "View as Desktop"
-msgstr "ডেস�কটপ হিসেবে প�রদর�শন করো"
-
 #: src/file-manager/fm-desktop-icon-view.c:799
-msgid "View as _Desktop"
-msgstr "ডেস�কটপ হিসেবে প�রদর�শন করো (_ড)"
-
-#: src/file-manager/fm-desktop-icon-view.c:800
-msgid "The desktop view encountered an error."
-msgstr "ডেস�কটপ দৃশ�য সমস�যার সম�ম�খীন হয়েছে।"
-
-#: src/file-manager/fm-desktop-icon-view.c:801
-msgid "The desktop view encountered an error while starting up."
-msgstr "চাল� হওয়ার সময় ডেস�কটপ দৃশ�য সমস�যার সম�ম�খীন হয়েছে।"
-
-#: src/file-manager/fm-desktop-icon-view.c:802
-msgid "Display this location with the desktop view."
-msgstr "�ই অবস�থানকে ডেস�কটপ দৃশ�যের সাহায�যে প�রদর�শন করো।"
+#, fuzzy
+msgid "_Desktop"
+msgstr "ডেস�কটপ"
 
-#: src/file-manager/fm-directory-view.c:547
+#: src/file-manager/fm-directory-view.c:510
 #, c-format
 msgid "Open %d Window?"
 msgid_plural "Open %d Windows?"
-msgstr[0] "%dটি উইন�ডো চাল� করবো কি?"
-msgstr[1] "%dটি উইন�ডো চাল� করবো কি?"
+msgstr[0] "%dটি উইন�ডো চাল� করা হবে কি?"
+msgstr[1] "%dটি উইন�ডো চাল� করা হবে কি?"
 
-#: src/file-manager/fm-directory-view.c:548
+#: src/file-manager/fm-directory-view.c:511
 msgid "Are you sure you want to open all files?"
 msgstr "আপনি কি সবগ�লো ফাইল খোলার ব�যাপারে নিশ�চিত?"
 
-#: src/file-manager/fm-directory-view.c:549 src/nautilus-location-bar.c:158
+#: src/file-manager/fm-directory-view.c:512 src/nautilus-location-bar.c:158
 #, c-format
 msgid "This will open %d separate window."
 msgid_plural "This will open %d separate windows."
 msgstr[0] "�টি %dটি পৃথক উইন�ডো চাল� করবে।"
 msgstr[1] "�টি %dটি পৃথক উইন�ডো চাল� করবে।"
 
-#: src/file-manager/fm-directory-view.c:857
+#: src/file-manager/fm-directory-view.c:813
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "আপনি কি \"%s\"'কে স�থায়ীভাবে ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
 
-#: src/file-manager/fm-directory-view.c:861
+#: src/file-manager/fm-directory-view.c:817
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
 msgid_plural ""
@@ -2811,35 +3089,35 @@ msgid_plural ""
 msgstr[0] "আপনি কি বাছাইকৃত %dটি জিনিষ ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
 msgstr[1] "আপনি কি বাছাইকৃত %dটি জিনিষ ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
 
-#: src/file-manager/fm-directory-view.c:869
+#: src/file-manager/fm-directory-view.c:825
 msgid "If you delete an item, it is permanently lost."
 msgstr "কোন জিনিষ ম�ছে ফেললে তা চিরতরে হারিয়ে যায়।"
 
-#: src/file-manager/fm-directory-view.c:870
+#: src/file-manager/fm-directory-view.c:826
 msgid "Delete?"
 msgstr "ম�ছে ফেলা হবে কি?"
 
-#: src/file-manager/fm-directory-view.c:1022
+#: src/file-manager/fm-directory-view.c:977
 msgid "Select Pattern"
 msgstr "প�যাটার�ন বাছাই কর�ন"
 
-#: src/file-manager/fm-directory-view.c:1038
+#: src/file-manager/fm-directory-view.c:993
 msgid "_Pattern:"
 msgstr "প�যাটার�ন (_প):"
 
-#: src/file-manager/fm-directory-view.c:1865
+#: src/file-manager/fm-directory-view.c:1791
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\"-কে চিহ�নিত করা হয়েছে"
 
-#: src/file-manager/fm-directory-view.c:1867
+#: src/file-manager/fm-directory-view.c:1793
 #, c-format
 msgid "%d folder selected"
 msgid_plural "%d folders selected"
 msgstr[0] "%dটি ফোল�ডার বাছাই করা হয়েছে"
 msgstr[1] "%dটি ফোল�ডার বাছাই করা হয়েছে"
 
-#: src/file-manager/fm-directory-view.c:1877
+#: src/file-manager/fm-directory-view.c:1803
 #, c-format
 msgid " (containing %d item)"
 msgid_plural " (containing %d items)"
@@ -2847,19 +3125,19 @@ msgstr[0] " (%dটি জিনিষ আছে)"
 msgstr[1] " (%dটি জিনিষ আছে)"
 
 #. translators: this is preceded with a string of form 'N folders' (N more than 1)
-#: src/file-manager/fm-directory-view.c:1888
+#: src/file-manager/fm-directory-view.c:1814
 #, c-format
 msgid " (containing a total of %d item)"
 msgid_plural " (containing a total of %d items)"
 msgstr[0] " (সর�বমোট %dটি জিনিষ আছে)"
 msgstr[1] " (সর�বমোট %dটি জিনিষ আছে)"
 
-#: src/file-manager/fm-directory-view.c:1904
+#: src/file-manager/fm-directory-view.c:1830
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" বাছাই করা হয়েছে (%s)"
 
-#: src/file-manager/fm-directory-view.c:1908
+#: src/file-manager/fm-directory-view.c:1834
 #, c-format
 msgid "%d item selected (%s)"
 msgid_plural "%d items selected (%s)"
@@ -2867,7 +3145,7 @@ msgstr[0] "%dটি জিনিষ বাছাই করা হয়েছে (%
 msgstr[1] "%dটি জিনিষ বাছাই করা হয়েছে (%s)"
 
 #. Folders selected also, use "other" terminology
-#: src/file-manager/fm-directory-view.c:1916
+#: src/file-manager/fm-directory-view.c:1842
 #, c-format
 msgid "%d other item selected (%s)"
 msgid_plural "%d other items selected (%s)"
@@ -2875,7 +3153,7 @@ msgstr[0] "আরো %dটি জিনিষ বাছাই করা হয়à§
 msgstr[1] "আরো %dটি জিনিষ বাছাই করা হয়েছে (%s)"
 
 # FIXME
-#: src/file-manager/fm-directory-view.c:1937
+#: src/file-manager/fm-directory-view.c:1863
 #, c-format
 msgid "%s, Free space: %s"
 msgstr "%s, ফা�কা স�থান: %s"
@@ -2887,7 +3165,7 @@ msgstr "%s, ফা�কা স�থান: %s"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1962
+#: src/file-manager/fm-directory-view.c:1888
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -2896,65 +3174,55 @@ 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:2032
+#: src/file-manager/fm-directory-view.c:1958
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "নটিলাস যতগ�লো ফাইল নিয়ে কাজ করতে পারে, \"%s\" ফোল�ডারে তা অপেক�ষাও বেশি ফাইল "
 "আছে।"
 
-#: src/file-manager/fm-directory-view.c:2038
+#: src/file-manager/fm-directory-view.c:1964
 msgid "Some files will not be displayed."
 msgstr "কিছ� ফাইল তাই প�রদর�শন করা হবে না।"
 
-#: src/file-manager/fm-directory-view.c:2039
+#: src/file-manager/fm-directory-view.c:1965
 msgid "Too Many Files"
 msgstr "ফাইলের সংখ�যা অত�যধিক"
 
-#: src/file-manager/fm-directory-view.c:3353
+#: src/file-manager/fm-directory-view.c:3113
 msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "ফাইলকে আবর�জনার বাক�সে স�থানান�তর করা যাচ�ছে না; � অবস�থায় আপনি কি ফাইলকে �খনই ম�ছে "
 "ফেলতে চান?"
 
-#: src/file-manager/fm-directory-view.c:3354
+#: src/file-manager/fm-directory-view.c:3114
 #, c-format
 msgid "The file \"%s\" cannot be moved to the trash."
 msgstr "\"%s\" ফাইলটিকে আবর�জনার বাক�সে স�থানান�তর করা যাচ�ছে না।"
 
-#: src/file-manager/fm-directory-view.c:3358
+#: src/file-manager/fm-directory-view.c:3118
 msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
 "কোন জিনিষ আবর�জনার বাক�সে সরিয়ে নেওয়া যাচ�ছে না।  আপনি কি �গ�লো �খনই ম�ছে ফেলতে "
 "চান?"
 
-#: src/file-manager/fm-directory-view.c:3359
-#, c-format
-msgid "None of the %d selected items can be moved to the Trash"
-msgstr "%d-টি চিহ�নিত জিনিষের �কটিকেও আবর�জনার বাক�সে স�থানান�তর করা যাবে না"
-
-#: src/file-manager/fm-directory-view.c:3361
+#: src/file-manager/fm-directory-view.c:3121
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 "কোন জিনিষ আবর�জনার বাক�সে স�থানান�তর করা যাচ�ছে না। আপনি কি �গ�লো �খনই ম�ছে ফেলতে "
 "চান?"
 
-#: src/file-manager/fm-directory-view.c:3362
-#, c-format
-msgid "%d of the selected items cannot be moved to the Trash"
-msgstr "চিহ�নিত জিনিষগ�লোর %dটিকে আবর�জনার বাক�সে স�থানান�তর করা যাবে না"
-
-#: src/file-manager/fm-directory-view.c:3368
+#: src/file-manager/fm-directory-view.c:3128
 msgid "Delete Immediately?"
-msgstr "�খনই কি অপসারণ করবো?"
+msgstr "�খনই কি মোছা হবে?"
 
-#: src/file-manager/fm-directory-view.c:3400
+#: src/file-manager/fm-directory-view.c:3160
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "আপনি কি আবর�জনার বাক�স থেকে \"%s\"-কে ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
 
-#: src/file-manager/fm-directory-view.c:3404
+#: src/file-manager/fm-directory-view.c:3164
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected item from the "
@@ -2967,56 +3235,56 @@ msgstr[0] ""
 msgstr[1] ""
 "আপনি কি আবর�জনার বাক�স থেকে %dটি বাছাইকৃত জিনিষকে মোছার ব�যাপারে নিশ�চিত?"
 
-#: src/file-manager/fm-directory-view.c:3413
+#: src/file-manager/fm-directory-view.c:3173
 msgid "If you delete an item, it will be permanently lost."
 msgstr "আপনি কোন জিনিষ ম�ছে ফেললে তা চিরতরে হারিয়ে যাবে।"
 
-#: src/file-manager/fm-directory-view.c:3414
+#: src/file-manager/fm-directory-view.c:3174
 msgid "Delete From Trash?"
-msgstr "আবর�জনার বাক�স থেকে অপসারণ করবো কি?"
+msgstr "আবর�জনার বাক�স থেকে মোছা হবে কি?"
 
-#: src/file-manager/fm-directory-view.c:3951
+#: src/file-manager/fm-directory-view.c:3658
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\" ব�যবহার করে খোলো"
 
-#: src/file-manager/fm-directory-view.c:3952
+#: src/file-manager/fm-directory-view.c:3659
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "চিহ�নিত ফাইল ব�যবহারের জন�য \"%s\" ব�যবহার করো"
 
-#: src/file-manager/fm-directory-view.c:4041
+#: src/file-manager/fm-directory-view.c:3748
 #, c-format
 msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "আপনি কি \"%s\"-কে চালাতে চান নাকি �র ভেতর যা লেখা আছে তা পড়তে চান?"
 
-#: src/file-manager/fm-directory-view.c:4043
+#: src/file-manager/fm-directory-view.c:3750
 #, c-format
 msgid "\"%s\" is an executable text file."
 msgstr "\"%s\" �কটি �ক�সিকিউটেবল টেক�সট ফাইল।"
 
-#: src/file-manager/fm-directory-view.c:4049
+#: src/file-manager/fm-directory-view.c:3756
 msgid "Run or Display?"
 msgstr "চালানো হবে নাকি লেখা প�রদর�শন করা হবে?"
 
-#: src/file-manager/fm-directory-view.c:4050
+#: src/file-manager/fm-directory-view.c:3757
 msgid "Run in _Terminal"
 msgstr "টার�মিনালে চালাও (_ট)"
 
-#: src/file-manager/fm-directory-view.c:4051
+#: src/file-manager/fm-directory-view.c:3758
 msgid "_Display"
 msgstr "প�রদর�শন (_প)"
 
-#: src/file-manager/fm-directory-view.c:4054
+#: src/file-manager/fm-directory-view.c:3761
 msgid "_Run"
 msgstr "চালাও (_চ)"
 
-#: src/file-manager/fm-directory-view.c:4440
+#: src/file-manager/fm-directory-view.c:4147
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s-কে খোলা যাচ�ছে না"
 
-#: src/file-manager/fm-directory-view.c:4443
+#: src/file-manager/fm-directory-view.c:4150
 #, c-format
 msgid ""
 "The filename \"%s\" indicates that this file is of type \"%s\". The contents "
@@ -3038,21 +3306,21 @@ msgstr ""
 "'চালানোর জন�য ব�যবহৃত হবে' নামের মেন� থেকে উপয�ক�ত অ�যাপলিকেশনকে বেছে নিতে পারেন।"
 
 # FIXME: ভাল শোনাচ�ছে না ;-(
-#: src/file-manager/fm-directory-view.c:4830
+#: src/file-manager/fm-directory-view.c:4571
 #, c-format
 msgid "Run \"%s\" on any selected items"
-msgstr "যেকোন �কটি চিহ�নিত ফাইলের জন�য \"%s\" চালাও"
+msgstr "কোন �কটি চিহ�নিত ফাইলের জন�য \"%s\" চালানো হোক"
 
-#: src/file-manager/fm-directory-view.c:5079
+#: src/file-manager/fm-directory-view.c:4820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "\"%s\" ছা�দ থেকে ডক�মেন�ট তৈরি করো"
 
-#: src/file-manager/fm-directory-view.c:5285
+#: src/file-manager/fm-directory-view.c:5026
 msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "স�ক�রিপ�ট মেন�তে �ই ফোল�ডারের সকল �ক�সিকিউটেবল ফাইলকে দেখানো হবে।"
 
-#: src/file-manager/fm-directory-view.c:5287
+#: src/file-manager/fm-directory-view.c:5028
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
@@ -3060,11 +3328,11 @@ msgstr ""
 "মেন� থেকে কোন স�ক�রিপ�ট বেছে নিলে তা যে কোন চিহ�নিত ফাইলকে ইনপ�ট হিসেবে ব�যবহার করে "
 "চলতে আরম�ভ করবে।"
 
-#: src/file-manager/fm-directory-view.c:5289
+#: src/file-manager/fm-directory-view.c:5030
 msgid "About Scripts"
 msgstr "স�ক�রিপ�ট সম�পর�কিত"
 
-#: src/file-manager/fm-directory-view.c:5290
+#: src/file-manager/fm-directory-view.c:5031
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -3105,495 +3373,479 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: বর�তমান উইন�ডোর আকার ও অবস�থান"
 
-#: src/file-manager/fm-directory-view.c:5451
-#: src/file-manager/fm-tree-view.c:900
+#: src/file-manager/fm-directory-view.c:5194
+#: src/file-manager/fm-tree-view.c:895
 #, c-format
-msgid "\"%s\" will be moved if you select the Paste command"
+msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "ফাইল পেস�ট করার কমান�ড দিলে \"%s\"-কে স�থানান�তর করা হবে"
 
-#: src/file-manager/fm-directory-view.c:5455
-#: src/file-manager/fm-tree-view.c:904
+#: src/file-manager/fm-directory-view.c:5198
+#: src/file-manager/fm-tree-view.c:899
 #, c-format
-msgid "\"%s\" will be copied if you select the Paste command"
+msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "ফাইল পেস�ট করার কমান�ড দিলে \"%s\"-কে কপি করা হবে"
 
-#: src/file-manager/fm-directory-view.c:5462
+#: src/file-manager/fm-directory-view.c:5205
 #, c-format
-msgid "The %d selected item will be moved if you select the Paste command"
+msgid ""
+"The %d selected item will be moved if you select the Paste Files command"
 msgid_plural ""
-"The %d selected items will be moved if you select the Paste command"
+"The %d selected items will be moved if you select the Paste Files command"
 msgstr[0] "ফাইল পেস�ট করার কমান�ড দিলে বাছাইকৃত %dটি জিনিষকে স�থানান�তর করা হবে"
 msgstr[1] "ফাইল পেস�ট করার কমান�ড দিলে বাছাইকৃত %dটি জিনিষকে স�থানান�তর করা হবে"
 
-#: src/file-manager/fm-directory-view.c:5469
+#: src/file-manager/fm-directory-view.c:5212
 #, c-format
-msgid "The %d selected item will be copied if you select the Paste command"
+msgid ""
+"The %d selected item will be copied if you select the Paste Files command"
 msgid_plural ""
-"The %d selected items will be copied if you select the Paste command"
+"The %d selected items will be copied if you select the Paste Files command"
 msgstr[0] "ফাইল পেস�ট করার কমান�ড দিলে বাছাইকৃত %dটি জিনিষকে কপি করা হবে"
 msgstr[1] "ফাইল পেস�ট করার কমান�ড দিলে বাছাইকৃত %dটি জিনিষকে কপি করা হবে"
 
-#: src/file-manager/fm-directory-view.c:5563
-#: src/file-manager/fm-tree-view.c:981
+#: src/file-manager/fm-directory-view.c:5293
+#: src/file-manager/fm-tree-view.c:975
 msgid "There is nothing on the clipboard to paste."
 msgstr "ক�লিপবোর�ডে পেস�ট করার মত কিছ� নেই।"
 
-#: src/file-manager/fm-directory-view.c:5689
-#: src/file-manager/fm-directory-view.c:7330
+#: src/file-manager/fm-directory-view.c:5400
+#: src/file-manager/fm-directory-view.c:6783
 msgid "Mount Error"
 msgstr "মাউন�ট করায় সমস�যা"
 
-#: src/file-manager/fm-directory-view.c:5746
-#: src/file-manager/fm-tree-view.c:1066
+#: src/file-manager/fm-directory-view.c:5457
+#: src/file-manager/fm-tree-view.c:1060
 msgid "Unmount Error"
 msgstr "আনমাউন�ট করায় সমস�যা"
 
-#: src/file-manager/fm-directory-view.c:5759
-#: src/file-manager/fm-tree-view.c:1063
+#: src/file-manager/fm-directory-view.c:5470
+#: src/file-manager/fm-tree-view.c:1057
 msgid "Eject Error"
 msgstr "বহিষ�কার করায় সমস�যা"
 
-#: src/file-manager/fm-directory-view.c:5908
+#: src/file-manager/fm-directory-view.c:5619
 #, c-format
 msgid "Connect to Server %s"
 msgstr "%s সার�ভারের সাথে সংযোগ স�থাপন করো"
 
-#: src/file-manager/fm-directory-view.c:5913
+#: src/file-manager/fm-directory-view.c:5624
 msgid "_Connect"
 msgstr "সংযোগ স�থাপন করো (_য)"
 
-#: src/file-manager/fm-directory-view.c:5927
+#: src/file-manager/fm-directory-view.c:5638
 msgid "Link _name:"
 msgstr "লিঙ�কের নাম (_ন):"
 
-#: src/file-manager/fm-directory-view.c:6100
+#: src/file-manager/fm-directory-view.c:5716
 msgid "Create _Document"
 msgstr "নত�ন ডক�মেন�ট তৈরি করো (_ত)"
 
 #. name, stock id, label
-#: src/file-manager/fm-directory-view.c:6101
+#: src/file-manager/fm-directory-view.c:5717
 msgid "Open Wit_h"
 msgstr "যে প�রোগ�রামের সাহায�যে চালানো হবে (_হ)"
 
 #. name, stock id, label
-#: src/file-manager/fm-directory-view.c:6102
+#: src/file-manager/fm-directory-view.c:5718
 msgid "Choose a program with which to open the selected item"
 msgstr "চিহ�নিত ফাইলটিকে ব�যবহারের জন�য �কটি প�রোগ�রাম বেছে নিন"
 
+#: src/file-manager/fm-directory-view.c:5719
+msgid "_Scripts"
+msgstr "স�ক�রিপ�ট (_ক)"
+
+#. name, stock id, label
+#: src/file-manager/fm-directory-view.c:5720
+#, fuzzy
+msgid "Run or manage scripts from ~/.gnome2/nautilus-scripts"
+msgstr "~/Nautilus/scripts �র স�ক�রিপ�টসমূহকে চালাও বা নিয়ন�ত�রণ করো"
+
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6104
-#: src/file-manager/fm-directory-view.c:6112
+#: src/file-manager/fm-directory-view.c:5722
 msgid "_Properties"
 msgstr "বৈশিষ�ট�যাবলী (_ব)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6105
+#: src/file-manager/fm-directory-view.c:5723
 msgid "View or modify the properties of each selected item"
 msgstr "প�রতিটি চিহ�নিত জিনিষের বৈশিষ�ট�য প�রদর�শন বা পরিবর�তন করো"
 
-#. label, accelerator
-#: src/file-manager/fm-directory-view.c:6113
-msgid "View or modify the properties of the open folder"
-msgstr "বর�তমান ফোল�ডারের বৈশিষ�ট�য প�রদর�শন বা পরিবর�তন করো"
-
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6116
+#: src/file-manager/fm-directory-view.c:5730
 msgid "Create _Folder"
 msgstr "নত�ন ফোল�ডার তৈরি করো (_ফ)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6117
+#: src/file-manager/fm-directory-view.c:5731
 msgid "Create a new empty folder inside this folder"
 msgstr "�ই ফোল�ডারের ভেতরে আরেকটি নত�ন ফা�কা ফোল�ডার তৈরি করো"
 
-#: src/file-manager/fm-directory-view.c:6119
+#: src/file-manager/fm-directory-view.c:5733
 msgid "No templates Installed"
 msgstr "কোন ছা�দ ইনস�টল করা নেই"
 
 #. name, stock id, label
 #. name, stock id
-#. translators: this is used to indicate that a file doesn't contain anything
-#: src/file-manager/fm-directory-view.c:6122
+#: src/file-manager/fm-directory-view.c:5735
 msgid "_Empty File"
 msgstr "ফাইল ফা�কা করো (_ফ)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6123
+#: src/file-manager/fm-directory-view.c:5736
 msgid "Create a new empty file inside this folder"
 msgstr "�ই ফোল�ডারের ভেতর �কটি নত�ন ফা�কা ফাইল তৈরি করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6130
-#: src/file-manager/fm-directory-view.c:6742
-#: src/file-manager/fm-tree-view.c:1105
+#: src/file-manager/fm-directory-view.c:5743
+#: src/file-manager/fm-directory-view.c:6220
 msgid "_Open"
 msgstr "খোলা (_খ)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6131
+#: src/file-manager/fm-directory-view.c:5744
 msgid "Open the selected item in this window"
 msgstr "চিহ�নিত জিনিষকে �ই উইন�ডোতে প�রদর�শন করো"
 
 #. name, stock id
-#. Location-specific actions
-#. name, stock id
-#: src/file-manager/fm-directory-view.c:6138
-#: src/file-manager/fm-directory-view.c:6234
+#: src/file-manager/fm-directory-view.c:5751
 msgid "Open in Navigation Window"
 msgstr "নেভিগেশন উইন�ডোতে খোলো"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6139
+#: src/file-manager/fm-directory-view.c:5752
 msgid "Open each selected item in a navigation window"
 msgstr "প�রতিটি চিহ�নিত জিনিষকে পৃথক পৃথক নেভিগেশন উইন�ডোতে প�রদর�শন করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6142
-#: src/file-manager/fm-directory-view.c:6146
+#: src/file-manager/fm-directory-view.c:5755
+#: src/file-manager/fm-directory-view.c:5759
 msgid "Open with Other _Application..."
 msgstr "অন�য কোন অ�যাপলিকেশনের সাহায�যে খোলো... (_প)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6143
-#: src/file-manager/fm-directory-view.c:6147
+#: src/file-manager/fm-directory-view.c:5756
+#: src/file-manager/fm-directory-view.c:5760
 msgid "Choose another application with which to open the selected item"
 msgstr "চিহ�নিত ফাইলটিকে ব�যবহারের জন�য অপর �কটি প�রোগ�রাম বেছে নিন"
 
+# msgstr "_ব�যবহার করা"
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6150
+#: src/file-manager/fm-directory-view.c:5763
 msgid "_Open Scripts Folder"
-msgstr "যে ফোল�ডারে স�ক�রিপ�টগ�লো অবস�থিত তা দেখাও (_খ)"
+msgstr "যে ফোল�ডারে স�ক�রিপ�টসমূহ অবস�থিত তা দেখাও (_খ)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6151
+#: src/file-manager/fm-directory-view.c:5764
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "�ই মেন�তে প�রদর�শিত স�ক�রিপ�টসমূহ যে ফোল�ডারে অবস�থিত তা দেখাও"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5771
+#: src/file-manager/fm-directory-view.c:6328
+msgid "Cu_t Files"
+msgstr "ফাইলগ�লো কাট করো (_ট)"
+
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6159
-msgid "Prepare the selected files to be moved with a Paste command"
+#: src/file-manager/fm-directory-view.c:5772
+msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "চিহ�নিত ফাইলসমূহকে পেস�ট কমান�ডের সাহায�যে স�থানান�তর করার ব�যবস�থা করো"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5775
+#: src/file-manager/fm-directory-view.c:6337
+msgid "_Copy Files"
+msgstr "ফাইলগ�লো কপি করো (_ক)"
+
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6163
-msgid "Prepare the selected files to be copied with a Paste command"
+#: src/file-manager/fm-directory-view.c:5776
+msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "চিহ�নিত ফাইলসমূহকে পেস�ট কম�যান�ডের সাহায�যে কপি করার ব�যবস�থা করো"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5779
+msgid "_Paste Files"
+msgstr "ফাইল পেস�ট করো (_প)"
+
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6167
-msgid "Move or copy files previously selected by a Cut or Copy command"
+#: src/file-manager/fm-directory-view.c:5780
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr "কাট বা কপি কম�যান�ডের সাহায�যে পূর�বে চিহ�নিত ফাইলসমূহকে স�থানান�তর বা কপি করো"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6172
-#: src/file-manager/fm-tree-view.c:1163
-msgid "_Paste Into Folder"
-msgstr "ফোল�ডারের মধ�যে পেস�ট করো (_প)"
+#: src/file-manager/fm-directory-view.c:5785
+msgid "_Paste Files Into Folder"
+msgstr "ফোল�ডারের মধ�যে ফাইল পেস�ট করো (_প)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6173
+#: src/file-manager/fm-directory-view.c:5786
 msgid ""
-"Move or copy files previously selected by a Cut or Copy command into the "
-"selected folder"
-msgstr ""
-"কাট বা কপি কম�যান�ডের সাহায�যে পূর�বে চিহ�নিত ফাইলগ�লোকে চিহ�নিত ফোল�ডারে স�থানান�তর বা "
-"কপি করো"
+"Move or copy files previously selected by a Cut Files or Copy Files command "
+"into the selected folder"
+msgstr "কাট বা কপি কম�যান�ডের সাহায�যে পূর�বে চিহ�নিত ফাইলসমূহকে স�থানান�তর বা কপি করো"
+
+#. name, stock id
+#: src/file-manager/fm-directory-view.c:5789
+msgid "Select _All Files"
+msgstr "সকল ফাইলকে চিহ�নিত করো (_স)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6177
+#: src/file-manager/fm-directory-view.c:5790
 msgid "Select all items in this window"
 msgstr "�ই উইন�ডোর সকল জিনিষকে চিহ�নিত করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6180
+#: src/file-manager/fm-directory-view.c:5793
 msgid "Select _Pattern"
 msgstr "প�যাটার�ন বাছাই করো (_ন)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6181
+#: src/file-manager/fm-directory-view.c:5794
 msgid "Select items in this window matching a given pattern"
 msgstr "�কটি নির�দিষ�ট প�যাটার�নের সাথে মিলয�ক�ত �ই উইন�ডোর সকল জিনিষকে বাছাই করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6184
+#: src/file-manager/fm-directory-view.c:5797
 msgid "D_uplicate"
 msgstr "প�রতিরূপ (_র)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6185
+#: src/file-manager/fm-directory-view.c:5798
 msgid "Duplicate each selected item"
 msgstr "প�রতিটি চিহ�নিত জিনিষের প�রতিরূপ (Duplicate) তৈরি করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6188
-#: src/file-manager/fm-directory-view.c:6815
+#: src/file-manager/fm-directory-view.c:5801
+#: src/file-manager/fm-directory-view.c:6297
 msgid "Ma_ke Link"
-msgid_plural "Ma_ke Links"
-msgstr[0] "লিঙ�ক তৈরি করো (_ল)"
-msgstr[1] "লিঙ�ক তৈরি করো (_ল)"
+msgstr "লিঙ�ক তৈরি করো (_ল)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6189
+#: src/file-manager/fm-directory-view.c:5802
 msgid "Create a symbolic link for each selected item"
 msgstr "প�রতিটি চিহ�নিত জিনিষের জন�য সিম�বলিক লিঙ�ক তৈরি করা হোক"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6192
+#: src/file-manager/fm-directory-view.c:5805
 msgid "_Rename..."
 msgstr "নাম পরিবর�তন (_র)..."
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6193
+#: src/file-manager/fm-directory-view.c:5806
 msgid "Rename selected item"
 msgstr "চিহ�নিত জিনিষগ�লোর নাম পরিবর�তন করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6200
-#: src/file-manager/fm-directory-view.c:6248
-#: src/file-manager/fm-directory-view.c:6616
-#: src/file-manager/fm-directory-view.c:6783
-#: src/file-manager/fm-directory-view.c:7128
+#: src/file-manager/fm-directory-view.c:5809
+#: src/file-manager/fm-directory-view.c:6263
+#: src/file-manager/fm-directory-view.c:6581
 msgid "Mo_ve to Trash"
 msgstr "আবর�জনার বাক�সে স�থানান�তর করো (_স)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6201
-#: src/file-manager/fm-directory-view.c:6784
+#: src/file-manager/fm-directory-view.c:5810
+#: src/file-manager/fm-directory-view.c:6264
 msgid "Move each selected item to the Trash"
 msgstr "প�রতিটি চিহ�নিত জিনিষকে আবর�জনার বাক�সে স�থানান�তর করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6204
-#: src/file-manager/fm-directory-view.c:6252
-#: src/file-manager/fm-directory-view.c:6802
+#: src/file-manager/fm-directory-view.c:5813
+#: src/file-manager/fm-directory-view.c:6282
 msgid "_Delete"
 msgstr "ম�ছে ফেলো (_ম)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6205
+#: src/file-manager/fm-directory-view.c:5814
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "আবর�জনার বাক�সে স�থানান�তর না করে সবগ�লো চিহ�নিত জিনিষকে সরাসরি ম�ছে ফেলো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6208
+#: src/file-manager/fm-directory-view.c:5817
 msgid "Reset View to _Defaults"
 msgstr "প�রদর�শনের জন�য ডিফল�ট দৃশ�য ব�যবহার করো"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6209
+#: src/file-manager/fm-directory-view.c:5818
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "সাজানোর ধারা ও জ�ম মাত�রা �মনভাবে পরিবর�তন করো যেন তা �ই দৃশ�যের বৈশিষ�ট�যের সাথে "
 "মিলে যায়"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6212
+#: src/file-manager/fm-directory-view.c:5821
 msgid "Connect To This Server"
 msgstr "�ই সার�ভারের সাথে সংযোগ স�থাপন করো"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6213
+#: src/file-manager/fm-directory-view.c:5822
 msgid "Make a permanent connection to this server"
 msgstr "�ই সার�ভারের সাথে �কটি স�থায়ী সংযোগ স�থাপন করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6216
+#: src/file-manager/fm-directory-view.c:5825
 msgid "_Mount Volume"
 msgstr "ভলিউম মাউন�ট করো (_ম)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6217
+#: src/file-manager/fm-directory-view.c:5826
 msgid "Mount the selected volume"
 msgstr "চিহ�নিত ভলিউমটিকে মাউন�ট করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6220
-#: src/file-manager/fm-tree-view.c:750
+#: src/file-manager/fm-directory-view.c:5829
+#: src/file-manager/fm-tree-view.c:745
 msgid "_Unmount Volume"
 msgstr "ফাইল সিস�টেম আনমাউন�ট করো (_আ)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6221
+#: src/file-manager/fm-directory-view.c:5830
 msgid "Unmount the selected volume"
 msgstr "চিহ�নিত ভলিউমকে আনমাউন�ট করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6224
+#: src/file-manager/fm-directory-view.c:5833
+#, fuzzy
 msgid "_Eject"
 msgstr "বহিষ�কার (_হ)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6225
+#: src/file-manager/fm-directory-view.c:5834
+#, fuzzy
 msgid "Eject the selected volume"
-msgstr "বাছাইকৃত ভলিউমকে বহিষ�কার করো"
+msgstr "বাছাইকৃত ভলিউমকে স�রক�ষা ( Protect ) করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6228
+#: src/file-manager/fm-directory-view.c:5837
+#, fuzzy
 msgid "Open File and Close window"
-msgstr "ফাইল খোলো ও উইন�ডো বন�ধ করো"
-
-#. label, accelerator
-#: src/file-manager/fm-directory-view.c:6235
-msgid "Open this folder in a navigation window"
-msgstr "�ই ফোল�ডারকে নেভিগেশন উইন�ডোতে খোলো"
-
-#. name, stock id
-#. label, accelerator
-#: src/file-manager/fm-directory-view.c:6240
-msgid "Prepare this folder to be moved with a Paste command"
-msgstr "�ই ফোল�ডারকে পেস�ট কমান�ডের সাহায�যে স�থানান�তরের ব�যবস�থা করো"
-
-#. name, stock id
-#. label, accelerator
-#: src/file-manager/fm-directory-view.c:6244
-msgid "Prepare this folder to be copied with a Paste command"
-msgstr "�ই ফোল�ডারকে পেস�ট কমান�ডের সাহায�যে কপি করার ব�যবস�থা করো"
-
-#. label, accelerator
-#: src/file-manager/fm-directory-view.c:6249
-msgid "Move this folder to the Trash"
-msgstr "�ই ফোল�ডারকে আবর�জনার বাক�সে স�থানান�তর করো"
-
-#. label, accelerator
-#: src/file-manager/fm-directory-view.c:6253
-msgid "Delete this folder, without moving to the Trash"
-msgstr "�ই ফোল�ডারকে আবর�জনার বাক�সে স�থানান�তর না করেই অপসারণ করো"
+msgstr "%dটি নত�ন উইন�ডোতে চাল� করো"
 
 #. name, stock id
-#: src/file-manager/fm-directory-view.c:6259
+#: src/file-manager/fm-directory-view.c:5844
 msgid "Show _Hidden Files"
 msgstr "ল�ক�কায়িত ফাইল প�রদর�শন করো (_ল)"
 
 #. label, accelerator
-#: src/file-manager/fm-directory-view.c:6260
-msgid "Toggle the display of hidden files in the current window"
-msgstr "বর�তমান উইন�ডোতে ল�কানো ফাইল দেখানোর মোড পাল�টাও"
+#: src/file-manager/fm-directory-view.c:5845
+msgid "Toggles the display of hidden files in the current window"
+msgstr ""
 
-#. Translators: %s is a directory
-#: src/file-manager/fm-directory-view.c:6309
+#: src/file-manager/fm-directory-view.c:6209
 #, c-format
-msgid "Run or manage scripts from %s"
-msgstr "%s-�র স�ক�রিপ�টগ�লোকে চালাও বা নিয়ন�ত�রণ করো"
-
-#. Create a script action here specially because its tooltip is dynamic
-#: src/file-manager/fm-directory-view.c:6311
-msgid "_Scripts"
-msgstr "স�ক�রিপ�ট (_ক)"
+msgid "_Open with \"%s\""
+msgstr "\"%s\" ব�যবহার করে খোলো (_খ)"
 
 #. add the "open in new window" menu item
-#: src/file-manager/fm-directory-view.c:6585
-#: src/file-manager/fm-directory-view.c:6751
-#: src/file-manager/fm-tree-view.c:1116
+#: src/file-manager/fm-directory-view.c:6229
+#: src/file-manager/fm-directory-view.c:6231
+#: src/file-manager/fm-tree-view.c:1110
+#, c-format
 msgid "Open in New Window"
-msgstr "নত�ন উইন�ডোতে চাল� করো"
+msgid_plural "Open in %d New Windows"
+msgstr[0] "%dটি নত�ন উইন�ডোতে চাল� করো"
+msgstr[1] "%dটি নত�ন উইন�ডোতে চাল� করো"
 
-#: src/file-manager/fm-directory-view.c:6587
-#: src/file-manager/fm-directory-view.c:6759
+#: src/file-manager/fm-directory-view.c:6238
+#, fuzzy
 msgid "_Browse Folder"
-msgid_plural "_Browse Folders"
-msgstr[0] "ফোল�ডার ব�রাউজ করো (_ব)"
-msgstr[1] "ফোল�ডার ব�রাউজ করো (_ব)"
+msgstr "ফোল�ডার ব�রাউজ করো"
 
-#: src/file-manager/fm-directory-view.c:6612
-#: src/file-manager/fm-directory-view.c:6779
+#: src/file-manager/fm-directory-view.c:6240
+#, fuzzy
+msgid "_Browse Folders"
+msgstr "ফোল�ডার ব�রাউজ করো"
+
+#: src/file-manager/fm-directory-view.c:6259
 msgid "_Delete from Trash"
 msgstr "আবর�জনার বাক�স থেকে ম�ছে ফেলো (_ম)"
 
-#: src/file-manager/fm-directory-view.c:6613
-msgid "Delete the open folder permanently"
-msgstr "বর�তমান ফোল�ডারকে স�থায়ীভাবে অপসারণ করো"
-
-#: src/file-manager/fm-directory-view.c:6617
-msgid "Move the open folder to the Trash"
-msgstr "বর�তমান ফোল�ডারকে আবর�জনার বাক�সে স�থানান�তর করো"
+#: src/file-manager/fm-directory-view.c:6260
+msgid "Delete all selected items permanently"
+msgstr "চিহ�নিত সবকিছ� ম�ছে ফেলো"
 
-#: src/file-manager/fm-directory-view.c:6731
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\" ব�যবহার করে খোলো (_খ)"
+#: src/file-manager/fm-directory-view.c:6296
+msgid "Ma_ke Links"
+msgstr "লিঙ�ক তৈরি করো (_র)"
 
-#: src/file-manager/fm-directory-view.c:6753
-#, c-format
-msgid "Open in %d New Window"
-msgid_plural "Open in %d New Windows"
-msgstr[0] "%dটি নত�ন উইন�ডোতে খোলো"
-msgstr[1] "%dটি নত�ন উইন�ডোতে খোলো"
+#: src/file-manager/fm-directory-view.c:6327
+msgid "Cu_t File"
+msgstr "ফাইল কাট করো (_ট)"
 
-#: src/file-manager/fm-directory-view.c:6780
-msgid "Delete all selected items permanently"
-msgstr "চিহ�নিত সবকিছ� ম�ছে ফেলো"
+#: src/file-manager/fm-directory-view.c:6336
+msgid "_Copy File"
+msgstr "ফাইল কপি করো (_ক)"
 
-#: src/file-manager/fm-directory-view.c:7119
+#: src/file-manager/fm-directory-view.c:6572
 msgid "The link is broken, do you want to move it to the Trash?"
 msgstr "�ই লিঙ�কটি অকেজো, �কে কি �খন আবর�জনার বাক�সে ফেলে দিতে চান?"
 
-#: src/file-manager/fm-directory-view.c:7121
+#: src/file-manager/fm-directory-view.c:6574
 msgid "This link can't be used, because it has no target."
 msgstr "কোন কিছ� নির�দেশ করে না বলে �ই লিঙ�কটি ব�যবহার করা যায় না।"
 
-#: src/file-manager/fm-directory-view.c:7123
+#: src/file-manager/fm-directory-view.c:6576
 #, c-format
 msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "�ই লিঙ�কটি \"%s\"-কে নির�দেশ করে যার কোন অস�তিত�ব নেই; � কারণে লিঙ�কটি ব�যবহারযোগ�য "
 "নয়।"
 
-#: src/file-manager/fm-directory-view.c:7128
+#: src/file-manager/fm-directory-view.c:6581
 msgid "Broken Link"
 msgstr "অকার�যকর লিঙ�ক"
 
-#: src/file-manager/fm-directory-view.c:7448
+#: src/file-manager/fm-directory-view.c:6901
 #, c-format
 msgid "Opening \"%s\"."
 msgstr "\"%s\" খোলা হচ�ছে।"
 
-#: src/file-manager/fm-directory-view.c:7455
+#: src/file-manager/fm-directory-view.c:6908
 msgid "Cancel Open?"
 msgstr "খোলার প�রচেষ�টা বাতিল করা হবে কি?"
 
 # FIXME
-#: src/file-manager/fm-directory-view.c:8341
+#: src/file-manager/fm-directory-view.c:7784
+#, fuzzy
 msgid "Download location?"
-msgstr "�খান থেকে ডাউনলোড করা হবে কি?"
+msgstr "আপনি কি %dটি অবস�থানকে দেখতে চান?"
 
-#: src/file-manager/fm-directory-view.c:8344
+#: src/file-manager/fm-directory-view.c:7787
+#, fuzzy
 msgid "You can download it or make a link to it."
-msgstr ""
-"আপনি �টি ডাউনলোড করতে পারেন অথবা �টি নির�দেশকারী �কটি লিঙ�ক তৈরি করতে পারেন"
+msgstr "কোন ফোল�ডারকে আপনি তার নিজের ভেতরেই স�থানান�তর করতে পারেন না।"
 
-#: src/file-manager/fm-directory-view.c:8347
+#: src/file-manager/fm-directory-view.c:7790
+#, fuzzy
 msgid "Make a _Link"
 msgstr "লিঙ�ক তৈরি করো (_ল)"
 
-#: src/file-manager/fm-directory-view.c:8351
+#: src/file-manager/fm-directory-view.c:7794
+#, fuzzy
 msgid "_Download"
-msgstr "ডাউনলোড (_ড)"
+msgstr "রিলোড (_ল)"
 
-#: src/file-manager/fm-directory-view.c:8410
-#: src/file-manager/fm-directory-view.c:8463
-#: src/file-manager/fm-directory-view.c:8561
+#: src/file-manager/fm-directory-view.c:7851
+#: src/file-manager/fm-directory-view.c:7873
+#: src/file-manager/fm-directory-view.c:7987
 msgid "Drag and drop is not supported."
 msgstr "টেনে �নে ফেলে দেওয়ার প�রক�রিয়া অসমর�থিত।"
 
 # FIXME:  I am not satisfied with this "টেনে �নে ফেলে দেওয়া" ;-(
-#: src/file-manager/fm-directory-view.c:8411
+#: src/file-manager/fm-directory-view.c:7852
 msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 "টেনে �নে ফেলে দেওয়ার প�রক�রিয়া শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমের ক�ষেত�রে প�রযোজ�য।"
 
-#: src/file-manager/fm-directory-view.c:8412
-#: src/file-manager/fm-directory-view.c:8465
-#: src/file-manager/fm-directory-view.c:8563
+#: src/file-manager/fm-directory-view.c:7853
+#: src/file-manager/fm-directory-view.c:7875
+#: src/file-manager/fm-directory-view.c:7989
 msgid "Drag and Drop Error"
 msgstr "টেনে �নে ফেলে দেওয়ার প�রক�রিয়ায় সমস�যা"
 
-#: src/file-manager/fm-directory-view.c:8464
-#: src/file-manager/fm-directory-view.c:8562
+#: src/file-manager/fm-directory-view.c:7874
+#: src/file-manager/fm-directory-view.c:7988
 msgid "An invalid drag type was used."
 msgstr "টেনে আনার সময় ভ�ল পদ�ধতি অবলম�বন করা হয়েছে।"
 
@@ -3605,10 +3857,6 @@ msgstr "মন�তব�য"
 msgid "URL"
 msgstr "ইউ.আর.�ল."
 
-#: src/file-manager/fm-ditem-page.c:343 src/file-manager/fm-ditem-page.c:354
-msgid "Description"
-msgstr "বিবরণ"
-
 #: src/file-manager/fm-ditem-page.c:344
 msgid "Link"
 msgstr "লিঙ�ক"
@@ -3776,7 +4024,7 @@ msgstr "নাম পরিবর�তনের প�রচেষ�টা ক
 msgid "by _Name"
 msgstr "নামান�সারে (_ন)"
 
-#: src/file-manager/fm-icon-view.c:135 src/file-manager/fm-icon-view.c:1437
+#: src/file-manager/fm-icon-view.c:135 src/file-manager/fm-icon-view.c:1431
 msgid "Keep icons sorted by name in rows"
 msgstr "আইকনগ�লোকে নামান�সারে সারিবদ�ধ করে সাজাও"
 
@@ -3784,7 +4032,7 @@ msgstr "আইকনগà§�লোকে নামানà§�সারে সারà
 msgid "by _Size"
 msgstr "আকারান�সারে (_আ)"
 
-#: src/file-manager/fm-icon-view.c:142 src/file-manager/fm-icon-view.c:1441
+#: src/file-manager/fm-icon-view.c:142 src/file-manager/fm-icon-view.c:1435
 msgid "Keep icons sorted by size in rows"
 msgstr "আইকনগ�লোকে আকারান�সারে সারিবদ�ধ করে সাজাও"
 
@@ -3792,7 +4040,7 @@ msgstr "আইকনগà§�লোকে আকারানà§�সারে সাà
 msgid "by _Type"
 msgstr "ধরন অন�সারে (_ধ)"
 
-#: src/file-manager/fm-icon-view.c:149 src/file-manager/fm-icon-view.c:1445
+#: src/file-manager/fm-icon-view.c:149 src/file-manager/fm-icon-view.c:1439
 msgid "Keep icons sorted by type in rows"
 msgstr "আইকনগ�লোকে ধরন অন�সারে সারিবদ�ধ করে সাজাও"
 
@@ -3800,7 +4048,7 @@ msgstr "আইকনগ�লোকে ধরন অন�সারে সার
 msgid "by Modification _Date"
 msgstr "সর�বশেষ পরিবর�তনের তারিখ অন�সারে (_ত)"
 
-#: src/file-manager/fm-icon-view.c:156 src/file-manager/fm-icon-view.c:1449
+#: src/file-manager/fm-icon-view.c:156 src/file-manager/fm-icon-view.c:1443
 msgid "Keep icons sorted by modification date in rows"
 msgstr "আইকনগ�লোকে সর�বশেষ পরিবর�তনের তারিখ অন�সারে সারিবদ�ধ করে সাজাও"
 
@@ -3808,277 +4056,242 @@ msgstr "আইকনগà§�লোকে সরà§�বশেষ পরিবরà§�à
 msgid "by _Emblems"
 msgstr "প�রতীক অন�সারে (_প)"
 
-#: src/file-manager/fm-icon-view.c:163 src/file-manager/fm-icon-view.c:1453
+#: src/file-manager/fm-icon-view.c:163 src/file-manager/fm-icon-view.c:1447
 msgid "Keep icons sorted by emblems in rows"
 msgstr "আইকনগ�লোকে প�রতীক অন�সারে সারিবদ�ধ করে সাজাও"
 
-#: src/file-manager/fm-icon-view.c:1397
+#: src/file-manager/fm-icon-view.c:1391
 msgid "Arran_ge Items"
 msgstr "জিনিষগ�লোকে নত�ন করে সাজাও (_স)"
 
 #. name, stock id, label
 #. name, stock id
-#: src/file-manager/fm-icon-view.c:1399
+#: src/file-manager/fm-icon-view.c:1393
 msgid "Str_etch Icon"
 msgstr "আইকন প�রসারিত করো (_র)"
 
 # FIXME
 #. label, accelerator
-#: src/file-manager/fm-icon-view.c:1400
+#: src/file-manager/fm-icon-view.c:1394
 msgid "Make the selected icon stretchable"
 msgstr "চিহ�নিত আইকনটিকে প�রসারণযোগ�য করো"
 
 #. name, stock id
-#: src/file-manager/fm-icon-view.c:1403 src/file-manager/fm-icon-view.c:1554
+#: src/file-manager/fm-icon-view.c:1397 src/file-manager/fm-icon-view.c:1548
 msgid "Restore Icons' Original Si_zes"
 msgstr "আইকনগ�লোর প�রকৃত আকার প�নর�দ�ধার করো (_ক)"
 
 # FIXME
 #. label, accelerator
-#: src/file-manager/fm-icon-view.c:1404
+#: src/file-manager/fm-icon-view.c:1398
 msgid "Restore each selected icon to its original size"
 msgstr "প�রতিটি চিহ�নিত আইকনের প�রকৃত আকার প�নর�দ�ধার করো"
 
 #. name, stock id
-#: src/file-manager/fm-icon-view.c:1407
+#: src/file-manager/fm-icon-view.c:1401
 msgid "Clean _Up by Name"
 msgstr "নামান�সারে সাজাও (_ম)"
 
 #. label, accelerator
-#: src/file-manager/fm-icon-view.c:1408
+#: src/file-manager/fm-icon-view.c:1402
+#, fuzzy
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 "আইকনগ�লোকে �মনভাবে সাজাও যেন তারা উইন�ডোর আকারের সাথে খাপ খেয়ে যায় �বং �কটির "
 "উপর আরেকটি উঠে না যায়"
 
 #. name, stock id
-#: src/file-manager/fm-icon-view.c:1414
+#: src/file-manager/fm-icon-view.c:1408
 msgid "Compact _Layout"
 msgstr "ঘনসজ�জা (_ঘ)"
 
 #. label, accelerator
-#: src/file-manager/fm-icon-view.c:1415
+#: src/file-manager/fm-icon-view.c:1409
 msgid "Toggle using a tighter layout scheme"
 msgstr "আরো ঘনভাবে সাজানোর যায় �রকম কোন স�কীম ( Scheme ) ব�যবহার করো"
 
 #. name, stock id
-#: src/file-manager/fm-icon-view.c:1419
+#: src/file-manager/fm-icon-view.c:1413
 msgid "Re_versed Order"
 msgstr "উল�টো ধারা (_উ)"
 
 #. label, accelerator
-#: src/file-manager/fm-icon-view.c:1420
+#: src/file-manager/fm-icon-view.c:1414
 msgid "Display icons in the opposite order"
 msgstr "উল�টো ধারায় আইকন সাজাও"
 
 # FIXME
 #. name, stock id
-#: src/file-manager/fm-icon-view.c:1424
+#: src/file-manager/fm-icon-view.c:1418
 msgid "_Keep Aligned"
 msgstr "সারিবদ�ধ করে রাখো (_স)"
 
 #. label, accelerator
-#: src/file-manager/fm-icon-view.c:1425
+#: src/file-manager/fm-icon-view.c:1419
 msgid "Keep icons lined up on a grid"
 msgstr "আইকনগ�লোকে �কটি ছা�চের মধ�যে সারিবদ�ধভাবে রাখো"
 
-#: src/file-manager/fm-icon-view.c:1432
+#: src/file-manager/fm-icon-view.c:1426
 msgid "_Manually"
 msgstr "নিজ হাতে (_হ)"
 
-#: src/file-manager/fm-icon-view.c:1433
+#: src/file-manager/fm-icon-view.c:1427
 msgid "Leave icons wherever they are dropped"
 msgstr "যেখানে আইকন রাখা হবে সেখানেই তা থাকবে"
 
-#: src/file-manager/fm-icon-view.c:1436
+#: src/file-manager/fm-icon-view.c:1430
 msgid "By _Name"
 msgstr "নামান�সারে (_ন)"
 
-#: src/file-manager/fm-icon-view.c:1440
+#: src/file-manager/fm-icon-view.c:1434
 msgid "By _Size"
 msgstr "আকারান�সারে (_আ)"
 
-#: src/file-manager/fm-icon-view.c:1444
+#: src/file-manager/fm-icon-view.c:1438
 msgid "By _Type"
 msgstr "_ধরন অন�সারে (_ধ)"
 
-#: src/file-manager/fm-icon-view.c:1448
+#: src/file-manager/fm-icon-view.c:1442
 msgid "By Modification _Date"
 msgstr "সর�বশেষ পরিবর�তনের তারিখ অন�সারে (_ত)"
 
-#: src/file-manager/fm-icon-view.c:1452
+#: src/file-manager/fm-icon-view.c:1446
 msgid "By _Emblems"
 msgstr "প�রতীক অন�সারে (_প)"
 
-#: src/file-manager/fm-icon-view.c:1555
+#: src/file-manager/fm-icon-view.c:1549
 msgid "Restore Icon's Original Si_ze"
 msgstr "আইকনের প�রকৃত আকার প�নর�দ�ধার করো (_ক)"
 
-#: src/file-manager/fm-icon-view.c:1956
+#: src/file-manager/fm-icon-view.c:1910
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\"-�র প�রতি নির�দেশ করছে"
 
-#: src/file-manager/fm-icon-view.c:2730
+#: src/file-manager/fm-icon-view.c:2673
 msgid "Icons"
 msgstr "আইকন"
 
-#: src/file-manager/fm-icon-view.c:2731
-msgid "View as Icons"
-msgstr "আইকনের সাহায�যে প�রদর�শন করো"
-
-#: src/file-manager/fm-icon-view.c:2732
-msgid "View as _Icons"
-msgstr "আইকনের সাহায�যে প�রদর�শন করো (_আ)"
-
-#: src/file-manager/fm-icon-view.c:2733
-msgid "The icon view encountered an error."
-msgstr "আইকন দৃশ�য সমস�যার সম�ম�খীন হয়েছে।"
-
-#: src/file-manager/fm-icon-view.c:2734
-msgid "The icon view encountered an error while starting up."
-msgstr "চাল� হওয়ার সময় আইকন দৃশ�য সমস�যার সম�ম�খীন হয়েছে।"
-
-#: src/file-manager/fm-icon-view.c:2735
-msgid "Display this location with the icon view."
-msgstr "�ই অবস�থানকে আইকন দৃশ�যের সাহায�যে প�রদর�শন করো।"
-
-#: src/file-manager/fm-list-model.c:363 src/file-manager/fm-tree-model.c:1212
-msgid "(Empty)"
-msgstr "( ফা�কা )"
-
-#: src/file-manager/fm-list-model.c:365 src/file-manager/fm-tree-model.c:1212
-msgid "Loading..."
-msgstr "আসিতেছে..."
+#: src/file-manager/fm-icon-view.c:2674
+#, fuzzy
+msgid "_Icons"
+msgstr "আইকন"
 
-#: src/file-manager/fm-list-view.c:1986
+#: src/file-manager/fm-list-view.c:1593
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s দৃশ�যমান কলাম"
 
 # FIXME
-#: src/file-manager/fm-list-view.c:2005
+#: src/file-manager/fm-list-view.c:1612
 msgid "Choose the order of information to appear in this folder."
 msgstr "�ই ফোল�ডারের যে ভাবে তথ�য সাজানো হবে তা বেছে নিন।"
 
 #. name, stock id
-#: src/file-manager/fm-list-view.c:2047
+#: src/file-manager/fm-list-view.c:1654
 msgid "Visible _Columns..."
 msgstr "দৃশ�যমান কলাম... (_ক)"
 
 #. label, accelerator
-#: src/file-manager/fm-list-view.c:2048
+#: src/file-manager/fm-list-view.c:1655
 msgid "Select the columns visible in this folder"
 msgstr "�ই ফোল�ডারের দৃশ�যমান কলামগ�লোকে বাছাই করো"
 
-#: src/file-manager/fm-list-view.c:2732
+#: src/file-manager/fm-list-view.c:2305
 msgid "List"
 msgstr "তালিকা"
 
-#: src/file-manager/fm-list-view.c:2733
-msgid "View as List"
-msgstr "তালিকার সাহায�যে প�রদর�শন করো"
-
-#: src/file-manager/fm-list-view.c:2734
-msgid "View as _List"
-msgstr "তালিকার সাহায�যে প�রদর�শন করো (_ত)"
-
-#: src/file-manager/fm-list-view.c:2735
-msgid "The list view encountered an error."
-msgstr "তালিকা দৃশ�য সমস�যার সম�ম�খীন হয়েছে।"
-
-#: src/file-manager/fm-list-view.c:2736
-msgid "The list view encountered an error while starting up."
-msgstr "চাল� হওয়ার সময় তালিকা দৃশ�য সমস�যার সম�ম�খীন হয়েছে।"
-
-#: src/file-manager/fm-list-view.c:2737
-msgid "Display this location with the list view."
-msgstr "�ই অবস�থানকে তালিকা দৃশ�য ব�যবহার করে প�রদর�শন করো।"
+#: src/file-manager/fm-list-view.c:2306
+#, fuzzy
+msgid "_List"
+msgstr "তালিকা"
 
-#: src/file-manager/fm-properties-window.c:512
+#: src/file-manager/fm-properties-window.c:482
 msgid "You can't assign more than one custom icon at a time!"
 msgstr "�কই সময়ে �কাধিক স�বনির�বাচিত আইকন নির�ধারণ করা যাবে না!"
 
-#: src/file-manager/fm-properties-window.c:513
-#: src/nautilus-information-panel.c:555
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:548
 msgid "Please drag just one image to set a custom icon."
 msgstr "অন�গ�রহপূর�বক স�বনির�বাচিত আইকন নির�ধারণের জন�য �কটিমাত�র ছবি ব�যবহার কর�ন।"
 
-#: src/file-manager/fm-properties-window.c:514
-#: src/nautilus-information-panel.c:556
+#: src/file-manager/fm-properties-window.c:484
+#: src/nautilus-information-panel.c:549
 msgid "More Than One Image"
 msgstr "�কাধিক চিত�র"
 
-#: src/file-manager/fm-properties-window.c:523
-#: src/nautilus-information-panel.c:575
+#: src/file-manager/fm-properties-window.c:493
+#: src/nautilus-information-panel.c:568
 msgid "The file that you dropped is not local."
 msgstr "যে ফাইলটি আপনি ব�যবহার করতে চাচ�ছেন তা স�থানীয় ফাইল সিস�টেমে অবস�থিত নয়। "
 
-#: src/file-manager/fm-properties-window.c:524
-#: src/file-manager/fm-properties-window.c:531
-#: src/nautilus-information-panel.c:576
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:569
 msgid "You can only use local images as custom icons."
 msgstr ""
 "স�বনির�বাচিত আইকন তৈরির ক�ষেত�রে শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমে অবস�থিত ছবিই ব�যবহার "
 "করা যাবে।"
 
-#: src/file-manager/fm-properties-window.c:525
-#: src/nautilus-information-panel.c:577
+#: src/file-manager/fm-properties-window.c:495
+#: src/nautilus-information-panel.c:570
 msgid "Local Images Only"
 msgstr "শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমে অবস�থিত ছবি"
 
-#: src/file-manager/fm-properties-window.c:530
-#: src/nautilus-information-panel.c:582
+#: src/file-manager/fm-properties-window.c:500
+#: src/nautilus-information-panel.c:575
 msgid "The file that you dropped is not an image."
 msgstr "যে ফাইলটি আপনি ব�যবহার করতে চাচ�ছেন তা কোন ছবি নয়।"
 
-#: src/file-manager/fm-properties-window.c:532
-#: src/nautilus-information-panel.c:584
+#: src/file-manager/fm-properties-window.c:502
+#: src/nautilus-information-panel.c:577
 msgid "Images Only"
 msgstr "শ�ধ�মাত�র ছবি"
 
-#: src/file-manager/fm-properties-window.c:1015
+#: src/file-manager/fm-properties-window.c:927
+#: src/file-manager/fm-tree-view.c:1203
 msgid "Properties"
 msgstr "বৈশিষ�ট�যাবলী"
 
-#: src/file-manager/fm-properties-window.c:1023
+#: src/file-manager/fm-properties-window.c:935
 #, c-format
 msgid "%s Properties"
 msgstr "%s-�র বৈশিষ�ট�যাবলী"
 
-#: src/file-manager/fm-properties-window.c:1537
+#: src/file-manager/fm-properties-window.c:1449
 msgid "Cancel Group Change?"
 msgstr "গ�র�প পরিবর�তনের প�রচেষ�টা কি বাতিল করা হবে?"
 
-#: src/file-manager/fm-properties-window.c:1538
+#: src/file-manager/fm-properties-window.c:1450
 msgid "Changing group."
 msgstr "গ�রপ পরিবর�তন করা হচ�ছে।"
 
-#: src/file-manager/fm-properties-window.c:1699
+#: src/file-manager/fm-properties-window.c:1611
 msgid "Cancel Owner Change?"
 msgstr "মালিকানা পরিবর�তনের প�রচেষ�টা কি বাতিল করা হবে?"
 
-#: src/file-manager/fm-properties-window.c:1700
+#: src/file-manager/fm-properties-window.c:1612
 msgid "Changing owner."
 msgstr "মালিকানা পরিবর�তন করা হচ�ছে।"
 
-#: src/file-manager/fm-properties-window.c:1906
+#: src/file-manager/fm-properties-window.c:1818
 msgid "nothing"
 msgstr "কিছ� না"
 
 # FIXME: "পড়া সম�ভব নয়"
-#: src/file-manager/fm-properties-window.c:1908
+#: src/file-manager/fm-properties-window.c:1820
 msgid "unreadable"
 msgstr "পড়ার অযোগ�য"
 
-#: src/file-manager/fm-properties-window.c:1918
+#: src/file-manager/fm-properties-window.c:1830
 #, c-format
 msgid "%d item, with size %s"
 msgid_plural "%d items, totalling %s"
 msgstr[0] "%dটি জিনিষ, মোট %s"
 msgstr[1] "%dটি জিনিষ, মোট %s"
 
-#: src/file-manager/fm-properties-window.c:1927
+# FIXME: msgstr "(কিছ� অংশ পড়া সম�ভব নয়)"
+#: src/file-manager/fm-properties-window.c:1839
 msgid "(some contents unreadable)"
 msgstr "(কিছ� অংশ পড়ার অযোগ�য)"
 
@@ -4088,232 +4301,253 @@ msgstr "(কিছ� অংশ পড়ার অযোগ�য)"
 #. * 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:1944
+#: src/file-manager/fm-properties-window.c:1856
 msgid "Contents:"
 msgstr "অভ�যন�তরস�থ জিনিষপত�র:"
 
-#: src/file-manager/fm-properties-window.c:2329
+#: src/file-manager/fm-properties-window.c:2247
 msgid "Basic"
 msgstr "প�রাথমিক"
 
-#. Name label
-#: src/file-manager/fm-properties-window.c:2357
+#: src/file-manager/fm-properties-window.c:2275
+msgid "_Names:"
+msgstr "নাম (_ন):"
+
+#: src/file-manager/fm-properties-window.c:2277
 msgid "_Name:"
-msgid_plural "_Names:"
-msgstr[0] "নাম (_ম):"
-msgstr[1] "নাম (_ম):"
+msgstr "নাম (_ম):"
 
-#: src/file-manager/fm-properties-window.c:2376
+#: src/file-manager/fm-properties-window.c:2326
 msgid "Type:"
 msgstr "ধরন:"
 
+#: src/file-manager/fm-properties-window.c:2328
+#: src/file-manager/fm-properties-window.c:2338
+#: src/file-manager/fm-properties-window.c:2344
+#: src/file-manager/fm-properties-window.c:2351
+#: src/file-manager/fm-properties-window.c:2355
+#: src/file-manager/fm-properties-window.c:2363
+#: src/file-manager/fm-properties-window.c:2369
 #: src/file-manager/fm-properties-window.c:2378
-#: src/file-manager/fm-properties-window.c:2388
-#: src/file-manager/fm-properties-window.c:2394
-#: src/file-manager/fm-properties-window.c:2401
-#: src/file-manager/fm-properties-window.c:2405
-#: src/file-manager/fm-properties-window.c:2413
-#: src/file-manager/fm-properties-window.c:2419
-#: src/file-manager/fm-properties-window.c:2428
-#: src/file-manager/fm-properties-window.c:2434
-#: src/file-manager/fm-properties-window.c:3027
-#: src/file-manager/fm-properties-window.c:3048
-#: src/file-manager/fm-properties-window.c:3139
-#: src/file-manager/fm-properties-window.c:3143
-#: src/file-manager/fm-properties-window.c:3147
+#: src/file-manager/fm-properties-window.c:2384
+#: src/file-manager/fm-properties-window.c:2977
+#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:3089
+#: src/file-manager/fm-properties-window.c:3093
+#: src/file-manager/fm-properties-window.c:3097
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2386
+#: src/file-manager/fm-properties-window.c:2336
 msgid "Size:"
 msgstr "আকার:"
 
-#: src/file-manager/fm-properties-window.c:2392 src/nautilus-location-bar.c:60
+#: src/file-manager/fm-properties-window.c:2342 src/nautilus-location-bar.c:60
 msgid "Location:"
 msgstr "অবস�থান:"
 
-#: src/file-manager/fm-properties-window.c:2399
+#: src/file-manager/fm-properties-window.c:2349
 msgid "Volume:"
 msgstr "শব�দমাত�রা:"
 
-#: src/file-manager/fm-properties-window.c:2403
+#: src/file-manager/fm-properties-window.c:2353
 msgid "Free space:"
 msgstr "ফা�কা স�থান:"
 
-#: src/file-manager/fm-properties-window.c:2411
+#: src/file-manager/fm-properties-window.c:2361
 msgid "Link target:"
 msgstr "লিঙ�ক যাকে নির�দেশ করে:"
 
-#: src/file-manager/fm-properties-window.c:2417
+#: src/file-manager/fm-properties-window.c:2367
 msgid "MIME type:"
 msgstr "মাইমের প�রকৃতি:"
 
-#: src/file-manager/fm-properties-window.c:2426
+#: src/file-manager/fm-properties-window.c:2376
 msgid "Modified:"
 msgstr "পরিবর�তিত:"
 
-#: src/file-manager/fm-properties-window.c:2432
+#: src/file-manager/fm-properties-window.c:2382
 msgid "Accessed:"
 msgstr "ব�যবহৃত:"
 
-#: src/file-manager/fm-properties-window.c:2448
+#: src/file-manager/fm-properties-window.c:2398
 msgid "_Select Custom Icon..."
 msgstr "স�বনির�বাচিত আইকন বেছে নিন... (_ব)"
 
-#: src/file-manager/fm-properties-window.c:2454
+#: src/file-manager/fm-properties-window.c:2404
 msgid "_Remove Custom Icon"
 msgstr "স�বনির�বাচিত আইকন ম�ছে ফেলো (_ম)"
 
-#: src/file-manager/fm-properties-window.c:2521
+#: src/file-manager/fm-properties-window.c:2471
 #: src/nautilus-emblem-sidebar.c:1045
 msgid "Emblems"
 msgstr "প�রতীক"
 
-#: src/file-manager/fm-properties-window.c:2806
+#: src/file-manager/fm-properties-window.c:2756
 msgid "_Read"
 msgstr "পড়া (_প)"
 
-#: src/file-manager/fm-properties-window.c:2808
+#: src/file-manager/fm-properties-window.c:2758
 msgid "_Write"
 msgstr "লেখা (_ল)"
 
-#: src/file-manager/fm-properties-window.c:2810
+#: src/file-manager/fm-properties-window.c:2760
 msgid "E_xecute"
 msgstr "চালানো (_ল)"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2843
 msgid "Set _user ID"
 msgstr "ব�যবহারকারীর আইডি নির�ধারণ করো (_ব)"
 
-#: src/file-manager/fm-properties-window.c:2898
+#: src/file-manager/fm-properties-window.c:2848
 msgid "Special flags:"
 msgstr "বিশেষ ফ�ল�যাগ:"
 
-#: src/file-manager/fm-properties-window.c:2901
+#: src/file-manager/fm-properties-window.c:2851
 msgid "Set gro_up ID"
 msgstr "গ�র�প আইডি নির�ধারণ করো (_প)"
 
-#: src/file-manager/fm-properties-window.c:2903
+#: src/file-manager/fm-properties-window.c:2853
 msgid "_Sticky"
 msgstr "স�টিকি (_স)"
 
-#: src/file-manager/fm-properties-window.c:3002
+#: src/file-manager/fm-properties-window.c:2952
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "যেহেত� আপনি �র মালিক না, তাই আপনি �ই অন�মতিগ�লো পরিবর�তন করতে পারবেন না।"
 
-#: src/file-manager/fm-properties-window.c:3016
+#: src/file-manager/fm-properties-window.c:2966
 msgid "File _owner:"
 msgstr "ফাইলের মালিক (_ম):"
 
-#: src/file-manager/fm-properties-window.c:3022
+#: src/file-manager/fm-properties-window.c:2972
 msgid "File owner:"
 msgstr "ফাইলের মালিক:"
 
-#: src/file-manager/fm-properties-window.c:3033
+#: src/file-manager/fm-properties-window.c:2983
 msgid "_File group:"
 msgstr "ফাইলের গ�র�প (_ফ):"
 
-#: src/file-manager/fm-properties-window.c:3042
+#: src/file-manager/fm-properties-window.c:2992
 msgid "File group:"
 msgstr "ফাইলের গ�র�প:"
 
-#: src/file-manager/fm-properties-window.c:3054
+#: src/file-manager/fm-properties-window.c:3004
 msgid "Owner:"
 msgstr "মালিক:"
 
-#: src/file-manager/fm-properties-window.c:3055
+#: src/file-manager/fm-properties-window.c:3005
 msgid "Group:"
 msgstr "গ�র�প:"
 
-#: src/file-manager/fm-properties-window.c:3056
+#: src/file-manager/fm-properties-window.c:3006
 msgid "Others:"
 msgstr "অন�যান�য:"
 
-#: src/file-manager/fm-properties-window.c:3138
+#: src/file-manager/fm-properties-window.c:3088
 msgid "Text view:"
 msgstr "টেক�সট চিত�র:"
 
 # FIXME
-#: src/file-manager/fm-properties-window.c:3142
+#: src/file-manager/fm-properties-window.c:3092
 msgid "Number view:"
 msgstr "সংখ�যা চিত�র:"
 
-#: src/file-manager/fm-properties-window.c:3146
+#: src/file-manager/fm-properties-window.c:3096
 msgid "Last changed:"
 msgstr "সর�বশেষ পরিবর�তন:"
 
-#: src/file-manager/fm-properties-window.c:3152
+#: src/file-manager/fm-properties-window.c:3102
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\"-�র অন�মতি বো�া যাচ�ছে না।"
 
-#: src/file-manager/fm-properties-window.c:3155
+#: src/file-manager/fm-properties-window.c:3105
 msgid "The permissions of the selected file could not be determined."
 msgstr "নির�বাচিত ফাইলটির অন�মতি বো�া যাচ�ছে না।"
 
-#: src/file-manager/fm-properties-window.c:3313
+#: src/file-manager/fm-properties-window.c:3263
 msgid "There was an error displaying help."
 msgstr "সহায়িকা প�রদর�শনে সমস�যা: %s।"
 
-#: src/file-manager/fm-properties-window.c:3313
+#: src/file-manager/fm-properties-window.c:3263
 msgid "Couldn't Show Help"
 msgstr "সহায়িকা প�রদর�শন করা সম�ভব হয় নি"
 
-#: src/file-manager/fm-properties-window.c:3370
+#: src/file-manager/fm-properties-window.c:3305
 msgid "Open With"
 msgstr "যে প�রোগ�রামের সাহায�যে খোলা হবে"
 
-#: src/file-manager/fm-properties-window.c:3708
+#: src/file-manager/fm-properties-window.c:3643
 msgid "Cancel Showing Properties Window?"
 msgstr "বৈশিষ�ট�যাবলী প�রদর�শনকারী উইন�ডো চাল� করার প�রচেষ�টা কি বাতিল করা হবে?"
 
-#: src/file-manager/fm-properties-window.c:3709
+#: src/file-manager/fm-properties-window.c:3644
 msgid "Creating Properties window."
 msgstr "বৈশিষ�ট�যাবলী প�রদর�শনকারী উইন�ডো তৈরি করা হচ�ছে।"
 
-#: src/file-manager/fm-properties-window.c:3866
+#: src/file-manager/fm-properties-window.c:3801
 msgid "Select an icon"
 msgstr "�কটি আইকন বেছে নিন:"
 
-#: src/file-manager/fm-tree-view.c:750
+#: src/file-manager/fm-tree-model.c:1200
+msgid "(Empty)"
+msgstr "( ফা�কা )"
+
+#: src/file-manager/fm-tree-model.c:1200
+msgid "Loading..."
+msgstr "আসিতেছে..."
+
+#: src/file-manager/fm-tree-view.c:745
 msgid "E_ject"
 msgstr "বহিষ�কার (_হ)"
 
+#: src/file-manager/fm-tree-view.c:1099
+msgid "Open"
+msgstr "খোলো"
+
 #. add the "create folder" menu item
-#: src/file-manager/fm-tree-view.c:1129
+#: src/file-manager/fm-tree-view.c:1123
 msgid "Create Folder"
 msgstr "ফোল�ডার তৈরি করো"
 
-#: src/file-manager/fm-tree-view.c:1181
+#: src/file-manager/fm-tree-view.c:1139
+msgid "Cut Folder"
+msgstr "ফোল�ডার কাট করো"
+
+#: src/file-manager/fm-tree-view.c:1153
+msgid "Copy Folder"
+msgstr "ফোল�ডার কপি করো"
+
+#: src/file-manager/fm-tree-view.c:1167
+msgid "Paste Files into Folder"
+msgstr "ফোল�ডারের মধ�যে ফাইল পেস�ট করো"
+
+#: src/file-manager/fm-tree-view.c:1185
 msgid "Move to Trash"
 msgstr "আবর�জনার বাক�সে স�থানান�তর করো"
 
-#: src/file-manager/fm-tree-view.c:1245 src/nautilus-places-sidebar.c:170
-msgid "File System"
+#: src/file-manager/fm-tree-view.c:1254
+msgid "Filesystem"
 msgstr "ফাইল-সিস�টেম"
 
-#: src/file-manager/fm-tree-view.c:1247
+#: src/file-manager/fm-tree-view.c:1256
 msgid "Network Neighbourhood"
 msgstr "নেটওয়ার�ক প�রতিবেশি"
 
-#: src/file-manager/fm-tree-view.c:1488
+#: src/file-manager/fm-tree-view.c:1497
 msgid "Tree"
 msgstr "ট�রি"
 
-#: src/file-manager/fm-tree-view.c:1494
-msgid "Show Tree"
-msgstr "ট�রি প�রদর�শন করো"
-
-#: src/nautilus-application.c:257
+#: src/nautilus-application.c:251
 msgid "Couldn't Create Required Folder"
 msgstr "প�রয়োজনীয় ফোল�ডারটি তৈরি করা যায় নি"
 
-#: src/nautilus-application.c:258
+#: src/nautilus-application.c:252
 #, c-format
 msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "নটিলাস প�রয়োজনীয় ফোল�ডার \"%s\" তৈরি করতে পারে নি।"
 
-#: src/nautilus-application.c:260
+#: src/nautilus-application.c:254
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
@@ -4321,16 +4555,16 @@ msgstr ""
 "অন�গ�রহপূর�বক নটিলাস চালানোর পূর�বে নিম�নোক�ত ফোল�ডারটি তৈরি করে রাখ�ন, অথবা �মন অন�মতি "
 "রাখ�ন যেন নটিলাস নিজেই তা তৈরি করতে পারে।"
 
-#: src/nautilus-application.c:263
+#: src/nautilus-application.c:257
 msgid "Couldn't Create Required Folders"
 msgstr "প�রয়োজনীয় ফোল�ডারসমূহ তৈরি করা যায় নি"
 
-#: src/nautilus-application.c:264
+#: src/nautilus-application.c:258
 #, c-format
 msgid "Nautilus could not create the following required folders: %s."
 msgstr "নটিলাস নিম�নের প�রয়োজনীয় ফোল�ডারগ�লো তৈরি করতে পারে নি: %s।"
 
-#: src/nautilus-application.c:266
+#: src/nautilus-application.c:260
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
@@ -4338,15 +4572,15 @@ msgstr ""
 "অন�গ�রহপূর�বক নটিলাস চালানোর পূর�বে নিম�নোক�ত ফোল�ডারগ�লো তৈরি করে রাখ�ন, অথবা �মন "
 "অন�মতি রাখ�ন যেন নটিলাস নিজেই ফোল�ডারগ�লো তৈরি করতে পারে।"
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:328
 msgid "Link To Old Desktop"
 msgstr "প�রনো ডেস�কটপ নির�দেশকারী লিঙ�ক"
 
-#: src/nautilus-application.c:350
+#: src/nautilus-application.c:344
 msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
 msgstr "ডেস�কটপে \"প�রনো ডেস�কটপ নির�দেশকারী লিঙ�ক\" নামক �কটি লিঙ�ক তৈরি করা হয়েছে।"
 
-#: src/nautilus-application.c:351
+#: src/nautilus-application.c:345
 msgid ""
 "The location of the desktop directory has changed in GNOME 2.4. You can open "
 "the link and move over the files you want, then delete the link."
@@ -4355,7 +4589,7 @@ msgstr ""
 "প�রয়োজনীয় ফাইলগ�লো �ই নত�ন ডিরেক�টরিতে সরিয়ে �নে লিঙ�কটি ম�ছে ফেলতে পারেন।"
 
 # FIXME
-#: src/nautilus-application.c:353
+#: src/nautilus-application.c:347
 msgid "Migrated Old Desktop"
 msgstr "প�রনো ডেক�সটপের অবস�থান"
 
@@ -4369,7 +4603,7 @@ msgstr "প�রনো ডেক�সটপের অবস�থান"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:511
+#: src/nautilus-application.c:506
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -4380,7 +4614,7 @@ msgstr ""
 "করে নটিলাস ইনস�টল কর�ন।"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:517
+#: src/nautilus-application.c:512
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -4427,12 +4661,12 @@ msgstr ""
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: src/nautilus-application.c:547 src/nautilus-application.c:565
-#: src/nautilus-application.c:572
+#: src/nautilus-application.c:542 src/nautilus-application.c:560
+#: src/nautilus-application.c:567
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "�কটি অপ�রত�যাশিত সমস�যার কারণে �খন নটিলাস চালানো যাচ�ছে না।"
 
-#: src/nautilus-application.c:548
+#: src/nautilus-application.c:543
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -4440,7 +4674,7 @@ msgstr ""
 "বনোবো যখন ফাইল ব�যবস�থাপক ভিউ সার�ভারকে নিবন�ধিত করার চেষ�টা করছিল তখন �কটি "
 "অপ�রত�যাশিত সমস�যা হয়েছে �বং � কারণে �খন নটিলাস চালানো যাচ�ছে না।"
 
-#: src/nautilus-application.c:566
+#: src/nautilus-application.c:561
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the factory.Killing bonobo-activation-server and "
@@ -4450,7 +4684,7 @@ msgstr ""
 "নটিলাস চালানো যাবে না। বনোবো-অ�যাক�টিভেশন-সার�ভারকে বন�ধ করে প�নরায় নটিলাস চাল� "
 "করলে হয়তো সমস�যার সমাধান হতে পারে।"
 
-#: src/nautilus-application.c:573
+#: src/nautilus-application.c:568
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the shell object. Killing bonobo-activation-server and "
@@ -4460,9 +4694,9 @@ msgstr ""
 "নটিলাস চালানো যাবে না। বনোবো-অ�যাক�টিভেশন-সার�ভারকে বন�ধ করে প�নরায় নটিলাস চাল� "
 "করলে হয়তো সমস�যার সমাধান হতে পারে।"
 
-#: src/nautilus-bookmarks-window.c:157
+#: src/nautilus-bookmarks-window.c:154
 #: src/nautilus-file-management-properties.c:229
-#: src/nautilus-property-browser.c:1525 src/nautilus-window-menus.c:507
+#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:502
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4471,7 +4705,7 @@ msgstr ""
 "সহায়িকা প�রদর�শনে সমস�যা হয়েছে: \n"
 "%s"
 
-#: src/nautilus-bookmarks-window.c:191
+#: src/nautilus-bookmarks-window.c:188
 msgid "No bookmarks defined"
 msgstr "কোন ব�কমার�কের উল�লেখ নেই"
 
@@ -4491,101 +4725,103 @@ msgstr "<b>নাম (_ন)</b>"
 msgid "Edit Bookmarks"
 msgstr "ব�কমার�ক সম�পাদন করো"
 
-#: src/nautilus-connect-server-dialog-main.c:67
-#, c-format
+#: src/nautilus-connect-server-dialog-main.c:66
+#, fuzzy, c-format
 msgid "Can't display location \"%s\""
-msgstr "\"%s\" অবস�থানটি দেখানো যাচ�ছে না"
+msgstr "অবস�থানটি দেখানো যাচ�ছে না"
 
-#: src/nautilus-connect-server-dialog.c:145
-#: src/nautilus-connect-server-dialog.c:160
+#: src/nautilus-connect-server-dialog.c:143
+#: src/nautilus-connect-server-dialog.c:158
 msgid "Can't Connect to Server"
 msgstr "সার�ভারের সাথে সংযোগ স�থাপন করা যাচ�ছে না"
 
-#: src/nautilus-connect-server-dialog.c:158
+#: src/nautilus-connect-server-dialog.c:156
 msgid "You must enter a name for the server."
 msgstr "আপনাকে অবশ�যই সার�ভারের জন�য �কটি নাম লিখতে হবে।"
 
-#: src/nautilus-connect-server-dialog.c:159
+#: src/nautilus-connect-server-dialog.c:157
 msgid "Please enter a name and try again."
 msgstr "অন�গ�রহপূর�বক �কটি নাম লিখে প�নরায় চেষ�টা কর�ন।"
 
-#: src/nautilus-connect-server-dialog.c:410
+# FIXME
+#: src/nautilus-connect-server-dialog.c:269 src/nautilus-window.c:961
+#, c-format
+msgid "%s on %s"
+msgstr "%2$s-�র ওপর %1$s"
+
+#: src/nautilus-connect-server-dialog.c:388
 msgid "_Location (URI):"
 msgstr "অবস�থান (ইউ.আর.আই.)  (_অ):"
 
-#: src/nautilus-connect-server-dialog.c:457
+#: src/nautilus-connect-server-dialog.c:432
 msgid "_Server:"
 msgstr "সার�ভার (_স):"
 
-#: src/nautilus-connect-server-dialog.c:476
+#: src/nautilus-connect-server-dialog.c:451
 msgid "Optional information:"
 msgstr "�চ�ছিক তথ�য:"
 
-#: src/nautilus-connect-server-dialog.c:488
+#: src/nautilus-connect-server-dialog.c:463
 msgid "_Share:"
 msgstr "শেয়ার (_শ):"
 
-#: src/nautilus-connect-server-dialog.c:509
+#: src/nautilus-connect-server-dialog.c:484
 msgid "_Port:"
 msgstr "পোর�ট (_প):"
 
-#: src/nautilus-connect-server-dialog.c:529
+#: src/nautilus-connect-server-dialog.c:504
 msgid "_Folder:"
 msgstr "ফোল�ডার (_ফ):"
 
-#: src/nautilus-connect-server-dialog.c:549
+#: src/nautilus-connect-server-dialog.c:524
 msgid "_User Name:"
 msgstr "ব�যবহারকারীর-নাম (_ব):"
 
-#: src/nautilus-connect-server-dialog.c:570
-msgid "_Domain Name:"
-msgstr "ডোমেইন নাম (_ড):"
-
-#: src/nautilus-connect-server-dialog.c:594
+#: src/nautilus-connect-server-dialog.c:547
 msgid "_Name to use for connection:"
 msgstr "�ই সংযোগের জন�য যে নাম ব�যবহার করা হবে (_ন):"
 
-#: src/nautilus-connect-server-dialog.c:652
+#: src/nautilus-connect-server-dialog.c:605
 msgid "Connect to Server"
 msgstr "সার�ভারের সাথে সংযোগ স�থাপন করো"
 
-#: src/nautilus-connect-server-dialog.c:669
+#: src/nautilus-connect-server-dialog.c:622
 msgid "Service _type:"
 msgstr "সার�ভিসের ধরন (_ধ):"
 
-#: src/nautilus-connect-server-dialog.c:678
+#: src/nautilus-connect-server-dialog.c:631
 msgid "SSH"
 msgstr "�স.�স.�ইচ."
 
-#: src/nautilus-connect-server-dialog.c:680
+#: src/nautilus-connect-server-dialog.c:633
 msgid "Public FTP"
 msgstr "পাবলিক �ফ.টি.পি."
 
-#: src/nautilus-connect-server-dialog.c:682
+#: src/nautilus-connect-server-dialog.c:635
 msgid "FTP (with login)"
 msgstr "�ফ.টি.পি. (লগ-ইন সহ)"
 
-#: src/nautilus-connect-server-dialog.c:684
+#: src/nautilus-connect-server-dialog.c:637
 msgid "Windows share"
-msgstr "উইন�ডোজ শেয়ার"
+msgstr "উইন�ডোস শেয়ার"
 
-#: src/nautilus-connect-server-dialog.c:686
+#: src/nautilus-connect-server-dialog.c:639
 msgid "WebDAV (HTTP)"
 msgstr "ওয়েবড�যাভ (�ইচ.টি.টি.পি.)"
 
-#: src/nautilus-connect-server-dialog.c:688
+#: src/nautilus-connect-server-dialog.c:641
 msgid "Secure WebDAV (HTTPS)"
 msgstr "নিরাপদ ওয়েবড�যাভ (�ইচ.টি.টি.পি.�স.)"
 
-#: src/nautilus-connect-server-dialog.c:690
+#: src/nautilus-connect-server-dialog.c:643
 msgid "Custom Location"
 msgstr "স�বনির�বাচিত অবস�থান"
 
-#: src/nautilus-connect-server-dialog.c:742
+#: src/nautilus-connect-server-dialog.c:693
 msgid "Browse _Network"
 msgstr "নেটওয়ার�ক ব�রাউজ করো (_ন)"
 
-#: src/nautilus-connect-server-dialog.c:748
+#: src/nautilus-connect-server-dialog.c:699
 msgid "C_onnect"
 msgstr "সংযোগ স�থাপন করো (_য)"
 
@@ -4594,9 +4830,9 @@ msgstr "সংযোগ স�থাপন করো (_য)"
 msgid "Couldn't remove emblem with name '%s'."
 msgstr "'%s' নামের প�রতীকটি ম�ছে ফেলা যায় নি।"
 
-#: src/nautilus-emblem-sidebar.c:242 src/nautilus-emblem-sidebar.c:277
+#: src/nautilus-emblem-sidebar.c:242
 msgid ""
-"This is probably because the emblem is a permanent one, and not one that you "
+"This is probably because the emblem is a permanent one, and not one you "
 "added yourself."
 msgstr ""
 "�র কারণ সম�ভবত �ই যে, �টি �কটি স�থায়ী প�রতীক �বং আপনি নিজে �টিকে যোগ করেন নি।"
@@ -4610,6 +4846,13 @@ msgstr "প�রতীক ম�ছে ফেলা যায় নি"
 msgid "Couldn't rename emblem with name '%s'."
 msgstr "প�রতীকের নাম পরিবর�তন করে '%s' করা যায় নি।"
 
+#: src/nautilus-emblem-sidebar.c:277
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr ""
+"�র কারণ সম�ভবত �ই যে, �টি �কটি স�থায়ী প�রতীক �বং আপনি নিজে �টিকে যোগ করেন নি।"
+
 #: src/nautilus-emblem-sidebar.c:278
 msgid "Couldn't Rename Emblem"
 msgstr "প�রতীকের নাম পরিবর�তন করা যায় নি"
@@ -4685,10 +4928,6 @@ msgstr "'%s' নামের ফাইলটিকে কোন ছবির ফ
 msgid "The dragged file does not appear to be a valid image."
 msgstr "যে ফাইলটিকে টেনে আনা হয়েছে তা কোন ছবির ফাইল বলে মনে হচ�ছে না।"
 
-#: src/nautilus-emblem-sidebar.c:1051
-msgid "Show Emblems"
-msgstr "প�রতীক প�রদর�শন করো"
-
 #: src/nautilus-file-management-properties.c:307
 msgid "None"
 msgstr "কোনটিই নয়"
@@ -4973,10 +5212,6 @@ msgstr ""
 msgid "History"
 msgstr "ব�রাউজ-ইতিহাস"
 
-#: src/nautilus-history-sidebar.c:284
-msgid "Show History"
-msgstr "ব�রাউজ-ইতিহাস প�রদর�শন করো"
-
 #: src/nautilus-image-properties-page.c:219
 msgid "Camera Brand"
 msgstr "ক�যামেরার ব�র�যান�ড"
@@ -5020,40 +5255,36 @@ msgstr "শাটারের গতি"
 
 #: src/nautilus-image-properties-page.c:229
 msgid "ISO Speed Rating"
-msgstr "আই.�স.ও. গতি সারণী ( Speed rating )"
+msgstr "আই�সও গতি সারণী ( Speed rating )"
 
 #: src/nautilus-image-properties-page.c:230
 msgid "Software"
-msgstr "সফটওয়�যার"
+msgstr "সফটওয়ার"
 
 #: src/nautilus-image-properties-page.c:249
 #, c-format
-msgid "<b>Image Type:</b> %s (%s)\n"
-msgstr "<b>ছবির ধরন:</b> %s (%s)\n"
-
-#: src/nautilus-image-properties-page.c:251
-#, c-format
-msgid "<b>Width:</b> %d pixel\n"
-msgid_plural "<b>Width:</b> %d pixels\n"
-msgstr[0] "<b>প�রস�থ:</b> %d পিক�সেল\n"
-msgstr[1] "<b>প�রস�থ:</b> %d পিক�সেল\n"
-
-#: src/nautilus-image-properties-page.c:255
-#, c-format
-msgid "<b>Height:</b> %d pixel\n"
-msgid_plural "<b>Height:</b> %d pixels\n"
-msgstr[0] "<b>উচ�চতা:</b> %d পিক�সেল\n"
-msgstr[1] "<b>উচ�চতা:</b> %d পিক�সেল\n"
+msgid ""
+"<b>Image Type:</b> %s (%s)\n"
+"<b>Resolution:</b> %dx%d pixels\n"
+msgid_plural ""
+"<b>Image Type:</b> %s (%s)\n"
+"<b>Resolution:</b> %dx%d pixels\n"
+msgstr[0] ""
+"<b>চিত�রের ধরন:</b> %s (%s)\n"
+"<b>রেজল�শন:</b> %dx%d পিক�সেল\n"
+msgstr[1] ""
+"<b>চিত�রের ধরন:</b> %s (%s)\n"
+"<b>রেজল�শন:</b> %dx%d পিক�সেল\n"
 
-#: src/nautilus-image-properties-page.c:270
+#: src/nautilus-image-properties-page.c:264
 msgid "Failed to load image information"
-msgstr "চিত�র সংক�রান�ত তথ�য পড়া যায় নি"
+msgstr "চিত�রসংক�রান�ত তথ�য পড়া যায় নি"
 
-#: src/nautilus-image-properties-page.c:420
+#: src/nautilus-image-properties-page.c:414
 msgid "loading..."
 msgstr "আসিতেছে..."
 
-#: src/nautilus-image-properties-page.c:486
+#: src/nautilus-image-properties-page.c:480
 msgid "Image"
 msgstr "ছবি"
 
@@ -5061,44 +5292,40 @@ msgstr "ছবি"
 msgid "Information"
 msgstr "তথ�য"
 
-#: src/nautilus-information-panel.c:184
-msgid "Show Information"
-msgstr "তথ�য প�রদর�শন করো"
-
 #. add the reset background item, possibly disabled
-#: src/nautilus-information-panel.c:404
+#: src/nautilus-information-panel.c:397
 msgid "Use _Default Background"
 msgstr "ডিফল�ট পটভূমি ব�যবহার করো (_ড)"
 
 # FIXME: Assign-�র বাংলা ভাল হইলো না ;-(
-#: src/nautilus-information-panel.c:554
+#: src/nautilus-information-panel.c:547
 msgid "You can't assign more than one custom icon at a time."
 msgstr "�কই সময়ে �কাধিক স�বনির�বাচিত আইকনকে নির�ধারণ করা যাবে না!"
 
-#: src/nautilus-information-panel.c:583
+#: src/nautilus-information-panel.c:576
 msgid "You can only use images as custom icons."
-msgstr "স�বনির�বাচিত আইকন হিসেবে শ�ধ�মাত�র ছবির ফাইলগ�লোই ব�যবহার করা যায়।"
+msgstr "স�বনির�বাচিত আইকন হিসেবে শ�ধ�মাত�র ছবির ফাইলগ�লোই ব�যবহার করা যাবে।"
 
-#: src/nautilus-information-panel.c:898
+#: src/nautilus-information-panel.c:891
 #, c-format
 msgid "Open with %s"
 msgstr "%s ব�যবহার করে খোলো"
 
-#: src/nautilus-information-panel.c:993
+#: src/nautilus-information-panel.c:984
 msgid "Unable to launch the cd burner application."
 msgstr "সিডি লেখক অ�যাপ�লিকেশন চালানো গেল না।"
 
-#: src/nautilus-information-panel.c:994
+#: src/nautilus-information-panel.c:985
 msgid "Can't Launch CD Burner"
 msgstr "সিডি লেখক চালানো গেল না"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1039
+#: src/nautilus-information-panel.c:1030
 msgid "Empty _Trash"
 msgstr "আবর�জনার বাক�স খালি করো (_আ)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1055
+#: src/nautilus-information-panel.c:1046
 msgid "_Write contents to CD"
 msgstr "সিডিতে লেখো (_ল)"
 
@@ -5118,31 +5345,31 @@ msgstr[1] "আপনি কি %dটি অবস�থানকে দেখত
 msgid "View in Multiple Windows?"
 msgstr "পৃথক পৃথক উইন�ডোতে দেখানো হবে কি?"
 
-#: src/nautilus-location-dialog.c:140
+#: src/nautilus-location-dialog.c:139
 msgid "Open Location"
 msgstr "�ই অবস�থানটি খোলো"
 
-#: src/nautilus-location-dialog.c:151
+#: src/nautilus-location-dialog.c:150
 msgid "_Location:"
 msgstr "অবস�থান (_অ):"
 
-#: src/nautilus-main.c:269
+#: src/nautilus-main.c:212
 msgid "Perform a quick set of self-check tests."
 msgstr "সব কিছ� ঠিক আছে কিনা তা জানার জন�য নিজের ওপর দ�র�ত কিছ� পরীক�ষা চালাও।"
 
-#: src/nautilus-main.c:272
+#: src/nautilus-main.c:215
 msgid "Create the initial window with the given geometry."
 msgstr "প�রদত�ত আকার অন�যায়ী প�রথম উইন�ডোটি তৈরি করো।"
 
-#: src/nautilus-main.c:272
+#: src/nautilus-main.c:215
 msgid "GEOMETRY"
 msgstr "আকার"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:217
 msgid "Only create windows for explicitly specified URIs."
 msgstr "শ�ধ�মাত�র বিশেষভাবে উল�লেখকৃত ইউআরআই (URI) �র জন�য উইন�ডো তৈরি করো।"
 
-#: src/nautilus-main.c:276
+#: src/nautilus-main.c:219
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -5150,43 +5377,43 @@ msgstr ""
 "উইন�ডো নিয়ন�ত�রণ করা হবে না ( বৈশিষ�ট�যাবলী নির�দেশক ডায়ালগে নির�ধারিত মানসমূহকে "
 "অগ�রাহ�য করো )।"
 
-#: src/nautilus-main.c:278
+#: src/nautilus-main.c:221
 msgid "open a browser window."
 msgstr "�কটি ব�রাউজার উইন�ডো চালাও।"
 
-#: src/nautilus-main.c:280
+#: src/nautilus-main.c:223
 msgid "Quit Nautilus."
 msgstr "নটিলাস থেকে প�রস�থান করো।"
 
-#: src/nautilus-main.c:282
+#: src/nautilus-main.c:225
 msgid "Restart Nautilus."
 msgstr "নটিলাস প�নরায় চাল� করো।"
 
-#: src/nautilus-main.c:326
+#: src/nautilus-main.c:258
 msgid "File Manager"
 msgstr "ফাইল ব�যবস�থাপক"
 
 #. Set initial window title
-#: src/nautilus-main.c:332 src/nautilus-spatial-window.c:330
-#: src/nautilus-window-menus.c:444 src/nautilus-window.c:151
+#: src/nautilus-main.c:264 src/nautilus-spatial-window.c:330
+#: src/nautilus-window-menus.c:442 src/nautilus-window.c:147
 msgid "Nautilus"
 msgstr "নটিলাস"
 
 # FIXME
 #. translators: %s is an option (e.g. --check)
-#: src/nautilus-main.c:364 src/nautilus-main.c:373 src/nautilus-main.c:378
+#: src/nautilus-main.c:287 src/nautilus-main.c:296 src/nautilus-main.c:301
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
 msgstr "নটিলাস: ইউ.আর.আই. (URI) �র সাথে %s ব�যবহার করা যায় না।\n"
 
 # FIXME
-#: src/nautilus-main.c:369
+#: src/nautilus-main.c:292
 #, c-format
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "নটিলাস: --অন�যান�য অপশনের সাথে পরীক�ষা করা যাবে না।\n"
 
 # FIXME
-#: src/nautilus-main.c:383
+#: src/nautilus-main.c:306
 #, c-format
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "নটিলাস: --�কাধিক ইউআরআই (URI) �র সাথে আকার ব�যবহার করা যাবে না।\n"
@@ -5194,430 +5421,401 @@ msgstr "নটিলাস: --�কাধিক ইউআরআই (URI) �র
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-navigation-window-menus.c:115
+#: src/nautilus-navigation-window-menus.c:127
 msgid "Are you sure you want to forget history?"
 msgstr "আপনি কি ব�রাউজ-ইতিহাস ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
 
-#: src/nautilus-navigation-window-menus.c:116
+#: src/nautilus-navigation-window-menus.c:128
 msgid "If you do, you will be doomed to repeat it."
 msgstr "যদি আপনি প�রকৃতই রাজি থাকেন, তবে �জন�য আপনাকে ভবিষ�যতে অন�তপ�ত হতে হবে।"
 
-#: src/nautilus-navigation-window-menus.c:118
+#: src/nautilus-navigation-window-menus.c:130
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "আপনি কি নিশ�চিত যে আপনি যে সব স�থানে প�রবেশ করেছেন তার তালিকা ম�ছে ফেলতে চান?"
 
-#: src/nautilus-navigation-window-menus.c:120
+#: src/nautilus-navigation-window-menus.c:132
 msgid "If you clear the list of locations, they will be permanently deleted."
 msgstr "যদি আপনি অবস�থান তালিকা ম�ছে ফেলেন, তবে তারা চিরতরে হারিয়ে যাবে।"
 
-#: src/nautilus-navigation-window-menus.c:126
+#: src/nautilus-navigation-window-menus.c:138
 msgid "Clear History"
 msgstr "ব�রাউজ-ইতিহাস ম�ছে ফেলো"
 
-#: src/nautilus-navigation-window-menus.c:288
-#: src/nautilus-window-bookmarks.c:96
+#: src/nautilus-navigation-window-menus.c:287
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr ""
+"অস�তিত�বহীন অবস�থান নির�দেশক কোন ব�কমার�ককে কি আপনি তালিকা থেকে ম�ছে ফেলতে চান?"
+
+#: src/nautilus-navigation-window-menus.c:289
 #, c-format
 msgid "The location \"%s\" does not exist."
 msgstr "\"%s\" অবস�থানের কোন অস�তিত�ব নেই।"
 
-# FIXME: ভাল হয় নাই ;-(
-#: src/nautilus-navigation-window-menus.c:290
-msgid "The history location doesn't exist."
-msgstr "ব�রাউজ-ইতিহাস অবস�থানের কোন অস�তিত�ব নেই।"
-
 #: src/nautilus-navigation-window-menus.c:292
-#: src/nautilus-window-bookmarks.c:99
 msgid "Bookmark for Nonexistent Location"
 msgstr "অস�তিত�বহীন অবস�থান নির�দেশক ব�কমার�ক"
 
-#: src/nautilus-navigation-window-menus.c:416
+#: src/nautilus-navigation-window-menus.c:293
+msgid "Remove"
+msgstr "ম�ছে ফেলা"
+
+#: src/nautilus-navigation-window-menus.c:539
 msgid "_Go"
 msgstr "গন�তব�য (_গ)"
 
 #. name, stock id, label
-#: src/nautilus-navigation-window-menus.c:417
+#: src/nautilus-navigation-window-menus.c:540
 msgid "_Bookmarks"
 msgstr "ব�কমার�ক (_ব)"
 
 #. name, stock id, label
-#: src/nautilus-navigation-window-menus.c:418
+#: src/nautilus-navigation-window-menus.c:541
+#, fuzzy
 msgid "Open New _Window"
-msgstr "নত�ন উইন�ডো খোলো (_u)"
+msgstr "%dটি নত�ন উইন�ডোতে চাল� করো"
 
 #. name, stock id, label
-#: src/nautilus-navigation-window-menus.c:419
+#: src/nautilus-navigation-window-menus.c:542
+#, fuzzy
 msgid "Open another Nautilus window for the displayed location"
-msgstr "প�রদর�শিত অবস�থানের জন�য আরেকটি নটিলাস উইন�ডো খোলো"
+msgstr "�খানে ডিফল�ট পটভূমি ব�যবহার করো"
 
-#: src/nautilus-navigation-window-menus.c:421
+#: src/nautilus-navigation-window-menus.c:544
 msgid "Close _All Windows"
 msgstr "সকল উইন�ডো বন�ধ করো (_স)"
 
 #. name, stock id, label
-#: src/nautilus-navigation-window-menus.c:422
+#: src/nautilus-navigation-window-menus.c:545
 msgid "Close all Navigation windows"
 msgstr "সকল নেভিগেশন উইন�ডো বন�ধ করো"
 
-#: src/nautilus-navigation-window-menus.c:424
+#: src/nautilus-navigation-window-menus.c:547
 msgid "_Location..."
 msgstr "অবস�থান... (_অ)"
 
 #. name, stock id, label
-#: src/nautilus-navigation-window-menus.c:425
-#: src/nautilus-spatial-window.c:730
+#: src/nautilus-navigation-window-menus.c:548
+#: src/nautilus-spatial-window.c:582
 msgid "Specify a location to open"
-msgstr "যে অবস�থানটি খোলা হবে তা উল�লেখ কর�ন"
+msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:427
+#: src/nautilus-navigation-window-menus.c:550
+#, fuzzy
 msgid "Clea_r History"
-msgstr "ব�রাউজ-ইতিহাস ম�ছে ফেলো (_ম)"
+msgstr "ব�রাউজ-ইতিহাস ম�ছে ফেলো"
 
 #. name, stock id, label
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:551
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr "গন�তব�য মেন� �বং পূর�ববর�তী/পরবর�তী তালিকার সব লেখা ম�ছে ফেলো"
 
-#: src/nautilus-navigation-window-menus.c:430
-#: src/nautilus-spatial-window.c:738
+#: src/nautilus-navigation-window-menus.c:553
 msgid "_Add Bookmark"
 msgstr "ব�কমার�কের তালিকায় যোগ করো (_য)"
 
 #. name, stock id, label
-#: src/nautilus-navigation-window-menus.c:431
-#: src/nautilus-spatial-window.c:739
+#: src/nautilus-navigation-window-menus.c:554
 msgid "Add a bookmark for the current location to this menu"
 msgstr "�ই মেন�তে বর�তমান অবস�থান নির�দেশক �কটি ব�কমার�ক যোগ করো"
 
-#: src/nautilus-navigation-window-menus.c:433
-#: src/nautilus-spatial-window.c:741
+#: src/nautilus-navigation-window-menus.c:556
 msgid "_Edit Bookmarks"
 msgstr "ব�কমার�কের তালিকা সম�পাদন করো (_ম)"
 
 #. name, stock id, label
-#: src/nautilus-navigation-window-menus.c:434
-#: src/nautilus-spatial-window.c:742
+#: src/nautilus-navigation-window-menus.c:557
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "যে উইন�ডো থেকে �ই মেন�র ব�কমার�ক সম�পাদন করা যায় তা প�রদর�শন করো"
 
 #. name, stock id
-#: src/nautilus-navigation-window-menus.c:440
-msgid "_Main Toolbar"
-msgstr "প�রধান ট�লবার (_প)"
-
-#. label, accelerator
-#: src/nautilus-navigation-window-menus.c:441
-msgid "Change the visibility of this window's main toolbar"
-msgstr "�ই উইন�ডোর প�রধান অবস�থানসূচক বার আড়াল করা হবে কিনা তা নির�ধারণ কর�ন"
-
-#. is_active
-#. name, stock id
-#: src/nautilus-navigation-window-menus.c:445
+#: src/nautilus-navigation-window-menus.c:563
 msgid "_Side Pane"
 msgstr "সাইড পেন (_ধ)"
 
 #. label, accelerator
-#: src/nautilus-navigation-window-menus.c:446
+#: src/nautilus-navigation-window-menus.c:564
 msgid "Change the visibility of this window's sidebar"
 msgstr "উইন�ডোর সাইডবারটি আড়াল করা হবে কিনা তা নির�ধারণ কর�ন"
 
 #. is_active
 #. name, stock id
-#: src/nautilus-navigation-window-menus.c:450
+#: src/nautilus-navigation-window-menus.c:568
 msgid "Location _Bar"
 msgstr "অবস�থানসূচক বার (_ব)"
 
 #. label, accelerator
-#: src/nautilus-navigation-window-menus.c:451
+#: src/nautilus-navigation-window-menus.c:569
 msgid "Change the visibility of this window's location bar"
 msgstr "উইন�ডোর অবস�থানসূচক বার আড়াল করা হবে কিনা তা নির�ধারণ কর�ন"
 
 #. is_active
 #. name, stock id
-#: src/nautilus-navigation-window-menus.c:455
+#: src/nautilus-navigation-window-menus.c:573
 msgid "St_atusbar"
 msgstr "স�ট�যাটাসবার (_স)"
 
 #. label, accelerator
-#: src/nautilus-navigation-window-menus.c:456
+#: src/nautilus-navigation-window-menus.c:574
 msgid "Change the visibility of this window's statusbar"
 msgstr "উইন�ডোর স�ট�যাটাসবার আড়াল করা হবে কিনা তা নির�ধারণ কর�ন"
 
-#: src/nautilus-navigation-window-menus.c:480
+#: src/nautilus-navigation-window-menus.c:598
 msgid "_Back"
 msgstr "পূর�ববর�তী (_ব)"
 
-#: src/nautilus-navigation-window-menus.c:482
+#: src/nautilus-navigation-window-menus.c:600
 msgid "Go to the previous visited location"
 msgstr "গন�তব�য পূর�ববর�তী অবস�থান"
 
-#: src/nautilus-navigation-window-menus.c:483
-msgid "Back history"
-msgstr "পূর�ববর�তী ব�রাউজ-ইতিহাস"
-
-#: src/nautilus-navigation-window-menus.c:497
+#: src/nautilus-navigation-window-menus.c:614
 msgid "_Forward"
 msgstr "পরবর�তী (_র)"
 
-#: src/nautilus-navigation-window-menus.c:499
+#: src/nautilus-navigation-window-menus.c:616
 msgid "Go to the next visited location"
 msgstr "গন�তব�য পরবর�তী অবস�থান"
 
-#: src/nautilus-navigation-window-menus.c:500
-msgid "Forward history"
-msgstr "পরবর�তী ব�রাউজ-ইতিহাস"
-
-#: src/nautilus-navigation-window.c:793
+#: src/nautilus-navigation-window.c:613 src/nautilus-window.c:654
 #, c-format
+msgid "View as %s"
+msgstr "%s হিসেবে প�রদর�শন করো"
+
+#: src/nautilus-navigation-window.c:689
+#, fuzzy, c-format
 msgid "%s - File Browser"
-msgstr "%s - ফাইল ব�রাউজার"
+msgstr "ফাইল ব�রাউজার"
 
-#: src/nautilus-notes-viewer.c:388 src/nautilus-notes-viewer.c:498
+#: src/nautilus-notes-viewer.c:388 src/nautilus-notes-viewer.c:495
 msgid "Notes"
 msgstr "নোট"
 
-#: src/nautilus-notes-viewer.c:394
-msgid "Show Notes"
-msgstr "নোট প�রদর�শন করো"
-
-# FIXME
-#: src/nautilus-pathbar.c:1128 src/nautilus-places-sidebar.c:152
-msgid "Home"
-msgstr "ব�যক�তিগত ফোল�ডার"
-
-# FIXME
-#: src/nautilus-places-sidebar.c:474
-msgid "Places"
-msgstr "অবস�থান"
-
-# FIXME
-#: src/nautilus-places-sidebar.c:480
-msgid "Show Places"
-msgstr "অবস�থান প�রদর�শন করো"
-
 #. set the title and standard close accelerator
-#: src/nautilus-property-browser.c:278
+#: src/nautilus-property-browser.c:270
 msgid "Backgrounds and Emblems"
 msgstr "পটভূমি �বং প�রতীক"
 
-#: src/nautilus-property-browser.c:387
+#: src/nautilus-property-browser.c:379
 msgid "_Remove..."
 msgstr "ম�ছে ফেলা... (_ম)"
 
-#: src/nautilus-property-browser.c:407
+#: src/nautilus-property-browser.c:399
 msgid "_Add new..."
 msgstr "নত�ন যোগ করো... (_য)"
 
-#: src/nautilus-property-browser.c:960
+#: src/nautilus-property-browser.c:905
 #, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "দ�ঃখিত, কোনভাবেই %s প�যাটার�নটিকে ম�ছে ফেলা যায় নি।"
 
-#: src/nautilus-property-browser.c:961
+#: src/nautilus-property-browser.c:906
 msgid "Check that you have permission to delete the pattern."
 msgstr "প�যাটার�নটি মোছার অন�মতি আপনার আছে কিনা তা নিশ�চিত হোন।"
 
-#: src/nautilus-property-browser.c:962
+#: src/nautilus-property-browser.c:907
 msgid "Couldn't Delete Pattern"
 msgstr "প�যাটার�নটি মোছা যায় নি"
 
-#: src/nautilus-property-browser.c:990
+#: src/nautilus-property-browser.c:935
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "দ�ঃখিত, কোনভাবেই %s প�রতীকটি মোছা যায় নি।"
 
-#: src/nautilus-property-browser.c:991
+#: src/nautilus-property-browser.c:936
 msgid "Check that you have permission to delete the emblem."
 msgstr "প�রতীকটি মোছার অন�মতি আপনার আছে কিনা তা নিশ�চিত হোন।"
 
-#: src/nautilus-property-browser.c:992
+#: src/nautilus-property-browser.c:937
 msgid "Couldn't Delete Emblem"
 msgstr "প�রতীক মোছা যায় নি"
 
-#: src/nautilus-property-browser.c:1030
+#: src/nautilus-property-browser.c:975
 msgid "Create a New Emblem:"
 msgstr "নত�ন প�রতীক তৈরি করো:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:1043
+#: src/nautilus-property-browser.c:988
 msgid "_Keyword:"
 msgstr "নির�দেশক-শব�দ (_ন):"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1061
+#: src/nautilus-property-browser.c:1006
 msgid "_Image:"
 msgstr "ছবি (_ছ):"
 
-#: src/nautilus-property-browser.c:1065
+#: src/nautilus-property-browser.c:1010
 msgid "Select an image file for the new emblem:"
 msgstr "নত�ন প�রতীকের জন�য �কটি ছবির ফাইল বেছে নিন:"
 
-#: src/nautilus-property-browser.c:1089
+#: src/nautilus-property-browser.c:1034
 msgid "Create a New Color:"
 msgstr "নত�ন �কটি রং তৈরি করো:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1048
 msgid "Color _name:"
 msgstr "রঙের নাম (_ন):"
 
-#: src/nautilus-property-browser.c:1119
+#: src/nautilus-property-browser.c:1064
 msgid "Color _value:"
 msgstr "রঙের মান (_ম):"
 
-#: src/nautilus-property-browser.c:1151
+#: src/nautilus-property-browser.c:1096
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "দ�ঃখিত, \"%s\" কোন ফাইলের সঠিক নাম হতে পারে না।"
 
-#: src/nautilus-property-browser.c:1154
+#: src/nautilus-property-browser.c:1099
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "দ�ঃখিত, আপনি ফাইলের নাম হিসেবে যা লিখেছেন তা সঠিক নয়।"
 
-#: src/nautilus-property-browser.c:1155
+#: src/nautilus-property-browser.c:1100
 msgid "Please try again."
 msgstr "অন�গ�রহপূর�বক প�নরায় চেষ�টা কর�ন।"
 
-#: src/nautilus-property-browser.c:1157 src/nautilus-property-browser.c:1202
+#: src/nautilus-property-browser.c:1102 src/nautilus-property-browser.c:1147
 msgid "Couldn't Install Pattern"
 msgstr "প�যাটার�ন ইনস�টল করা যায় নি"
 
-#: src/nautilus-property-browser.c:1168
+#: src/nautilus-property-browser.c:1113
 msgid "Sorry, but you can't replace the reset image."
 msgstr "দ�ঃখিত, আপনি রিসেটের সময় ব�যবহৃত চিত�রটি পরিবর�তন করতে পারেন না।"
 
-#: src/nautilus-property-browser.c:1169
+#: src/nautilus-property-browser.c:1114
 msgid "Reset is a special image that cannot be deleted."
 msgstr "রিসেট �কটি বিশেষ অমোছনীয় ছবি।"
 
-#: src/nautilus-property-browser.c:1170 src/nautilus-property-browser.c:1396
-#: src/nautilus-property-browser.c:1412
+#: src/nautilus-property-browser.c:1115 src/nautilus-property-browser.c:1319
+#: src/nautilus-property-browser.c:1335
 msgid "Not an Image"
 msgstr "�টি কোন ছবি নয়"
 
-#: src/nautilus-property-browser.c:1201
+#: src/nautilus-property-browser.c:1146
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "দ�ঃখিত, প�যাটার�ন %s-কে ইনস�টল করা যায় নি।"
 
-#: src/nautilus-property-browser.c:1221
+#: src/nautilus-property-browser.c:1166
 msgid "Select an image file to add as a pattern"
 msgstr "প�যাটার�ন হিসেবে ব�যবহারের জন�য �কটি ছবির ফাইল বেছে নিন"
 
-#: src/nautilus-property-browser.c:1273 src/nautilus-property-browser.c:1304
+#: src/nautilus-property-browser.c:1227
 msgid "The color cannot be installed."
 msgstr "রংটিকে ইনস�টল করা যায় নি।"
 
-#: src/nautilus-property-browser.c:1274
-msgid "Sorry, but you must specify an unused color name for the new color."
-msgstr "দ�ঃখিত, নত�ন রঙের নাম হিসেবে আপনাকে অবশ�যই �কটি অব�যবহৃত নাম লিখতে হবে।"
+#: src/nautilus-property-browser.c:1228
+msgid "Sorry, but you must specify a non-blank name for the new color."
+msgstr "দ�ঃখিত, নত�ন রঙের নাম হিসেবে আপনাকে অবশ�যই কিছ� লিখতে হবে।"
 
-#: src/nautilus-property-browser.c:1275 src/nautilus-property-browser.c:1306
+#: src/nautilus-property-browser.c:1229
 msgid "Couldn't Install Color"
 msgstr "রং ইনস�টল করা যায় নি"
 
-#: src/nautilus-property-browser.c:1305
-msgid "Sorry, but you must specify a non-blank name for the new color."
-msgstr "দ�ঃখিত, নত�ন রঙের নাম হিসেবে আপনাকে অবশ�যই কিছ� লিখতে হবে।"
-
-#: src/nautilus-property-browser.c:1358
+#: src/nautilus-property-browser.c:1281
 msgid "Select a color to add"
 msgstr "তালিকায় যোগ করার জন�য �কটি রং বেছে নিন"
 
-#: src/nautilus-property-browser.c:1395 src/nautilus-property-browser.c:1411
+#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
 #, c-format
 msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "দ�ঃখিত, ছবি হিসেবে \"%s\" ব�যবহারযোগ�য নয়।"
 
-#: src/nautilus-property-browser.c:1396 src/nautilus-property-browser.c:1412
+#: src/nautilus-property-browser.c:1319 src/nautilus-property-browser.c:1335
 msgid "The file is not an image."
 msgstr "�ই ফাইলটিতে কোন ছবি নেই।"
 
-#: src/nautilus-property-browser.c:2089
+#: src/nautilus-property-browser.c:2040
 msgid "Select a Category:"
 msgstr "কোন �কটি শ�রেণী বেছে নিন:"
 
-#: src/nautilus-property-browser.c:2098
+#: src/nautilus-property-browser.c:2049
 msgid "C_ancel Remove"
 msgstr "সরিয়ে ফেলার প�রচেষ�টা বাতিল করো (_ব)"
 
-#: src/nautilus-property-browser.c:2104
+#: src/nautilus-property-browser.c:2055
 msgid "_Add a New Pattern..."
 msgstr "�কটি নত�ন প�যাটার�ন  যোগ করো... (_য)"
 
-#: src/nautilus-property-browser.c:2107
+#: src/nautilus-property-browser.c:2058
 msgid "_Add a New Color..."
 msgstr "�কটি নত�ন রং যোগ করো... (_য)"
 
-#: src/nautilus-property-browser.c:2110
+#: src/nautilus-property-browser.c:2061
 msgid "_Add a New Emblem..."
 msgstr "�কটি নত�ন প�রতীক যোগ করো... (_য)"
 
-#: src/nautilus-property-browser.c:2133
+#: src/nautilus-property-browser.c:2084
 msgid "Click on a pattern to remove it"
 msgstr "কোন প�যাটার�নকে সরিয়ে ফেলতে চাইলে তার ওপর ক�লিক কর�ন"
 
-#: src/nautilus-property-browser.c:2136
+#: src/nautilus-property-browser.c:2087
 msgid "Click on a color to remove it"
 msgstr "কোন রংকে সরিয়ে ফেলতে চাইলে তার ওপর ক�লিক কর�ন"
 
-#: src/nautilus-property-browser.c:2139
+#: src/nautilus-property-browser.c:2090
 msgid "Click on an emblem to remove it"
 msgstr "কোন প�রতীককে সরিয়ে ফেলতে চাইলে তার ওপর ক�লিক কর�ন"
 
-#: src/nautilus-property-browser.c:2148
+#: src/nautilus-property-browser.c:2099
 msgid "Patterns:"
 msgstr "প�যাটার�ন:"
 
-#: src/nautilus-property-browser.c:2151
+#: src/nautilus-property-browser.c:2102
 msgid "Colors:"
 msgstr "রং:"
 
-#: src/nautilus-property-browser.c:2154
+#: src/nautilus-property-browser.c:2105
 msgid "Emblems:"
 msgstr "প�রতীক:"
 
-#: src/nautilus-property-browser.c:2174
+#: src/nautilus-property-browser.c:2125
 msgid "_Remove a Pattern..."
 msgstr "�কটি প�যাটার�ন সরিয়ে ফেলো... (_স)"
 
-#: src/nautilus-property-browser.c:2177
+#: src/nautilus-property-browser.c:2128
 msgid "_Remove a Color..."
 msgstr "�কটি রং সরিয়ে ফেলো... (_স)"
 
-#: src/nautilus-property-browser.c:2180
+#: src/nautilus-property-browser.c:2131
 msgid "_Remove an Emblem..."
 msgstr "�কটি প�রতীক সরিয়ে ফেলো... (_স)"
 
-#: src/nautilus-side-pane.c:427
+#: src/nautilus-side-pane.c:425
 msgid "Close the side pane"
 msgstr "সাইড পেন বন�ধ করো"
 
+#: src/nautilus-side-pane.c:596
+#, c-format
+msgid "Show %s"
+msgstr "%s প�রদর�শন করো"
+
 # FIXME
-#: src/nautilus-spatial-window.c:728
+#: src/nautilus-spatial-window.c:580
 msgid "_Places"
 msgstr "অবস�থান (_অ):"
 
 #. name, stock id, label
-#: src/nautilus-spatial-window.c:729
+#: src/nautilus-spatial-window.c:581
 msgid "Open _Location..."
 msgstr "�ই অবস�থান খোলো... (_অ)"
 
-#: src/nautilus-spatial-window.c:732
+#: src/nautilus-spatial-window.c:584
 msgid "Close P_arent Folders"
 msgstr "উর�ধ�বস�থ উইন�ডো বন�ধ করো (_স)"
 
 #. name, stock id, label
-#: src/nautilus-spatial-window.c:733
+#: src/nautilus-spatial-window.c:585
 msgid "Close this folder's parents"
 msgstr "�ই ফোল�ডারের উর�ধ�বস�থ ফোল�ডার বন�ধ করো"
 
-#: src/nautilus-spatial-window.c:735
+#: src/nautilus-spatial-window.c:587
 msgid "Clos_e All Folders"
 msgstr "সকল ফোল�ডার বন�ধ করো (_স)"
 
 #. name, stock id, label
-#: src/nautilus-spatial-window.c:736
+#: src/nautilus-spatial-window.c:588
 msgid "Close all folder windows"
 msgstr "সকল ফোল�ডার উইন�ডো বন�ধ করো"
 
@@ -5629,171 +5827,160 @@ msgstr "থ�রোবার"
 msgid "provides visual status"
 msgstr "চিত�রের সাহায�যে অবস�থা প�রদর�শন করে"
 
-#: src/nautilus-window-bookmarks.c:94
-msgid ""
-"Do you want to remove any bookmarks with the non-existing location from your "
-"list?"
-msgstr ""
-"অস�তিত�বহীন অবস�থান নির�দেশক কোন ব�কমার�ককে কি আপনি তালিকা থেকে ম�ছে ফেলতে চান?"
+#: src/nautilus-window-manage-views.c:575
+msgid "View Failed"
+msgstr "প�রদর�শন করার যায় নি"
 
-#: src/nautilus-window-bookmarks.c:100
-msgid "Remove"
-msgstr "ম�ছে ফেলা"
+#: src/nautilus-window-manage-views.c:586
+#, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s দৃশ�য সমস�যার সম�ম�খীন হয়েছে �বং আর চলতে পারছে না।"
 
-#: src/nautilus-window-manage-views.c:599
+#: src/nautilus-window-manage-views.c:587
 msgid "You can choose another view or go to a different location."
 msgstr ""
 "আপনি অপর �কটি দৃশ�য বেছে নিতে পারেন অথবা অন�য কোন অবস�থান থেকে চেষ�টা করতে পারেন।"
 
-#: src/nautilus-window-manage-views.c:600
-#: src/nautilus-window-manage-views.c:614
-msgid "View Failed"
-msgstr "প�রদর�শন করার যায় নি"
+#: src/nautilus-window-manage-views.c:597
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr "চাল� হওয়ার সময় %s হিসেবে প�রদর�শনের চেষ�টা সমস�যার সম�ম�খীন হয়েছে।"
 
-#: src/nautilus-window-manage-views.c:613
+#: src/nautilus-window-manage-views.c:598
 msgid "The location cannot be displayed with this viewer."
 msgstr "�ই প�রদর�শকের সাহায�যে �ই অবস�থানের জিনিষপত�র প�রদর�শন করা যাবে না।"
 
 # FIXME
-#: src/nautilus-window-manage-views.c:1003
+#: src/nautilus-window-manage-views.c:985
 msgid "Content View"
 msgstr "অভ�যন�তরস�থ জিনিষপত�রের দৃশ�য"
 
-#: src/nautilus-window-manage-views.c:1004
+#: src/nautilus-window-manage-views.c:986
+#, fuzzy
 msgid "View of the current folder"
-msgstr "বর�তমান ফোল�ডারের দৃশ�য"
+msgstr "বর�তমান ফাইল অথবা ফোল�ডারের দৃশ�য"
 
-#: src/nautilus-window-manage-views.c:1361
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
 msgid "Nautilus has no installed viewer capable of displaying the folder."
-msgstr "�ই ফোল�ডারকে প�রদর�শন করার উপয�ক�ত কোন প�রদর�শক নটিলাসের সাথে ইনস�টল করা নেই।"
+msgstr "�ই ফাইলটিকে প�রদর�শন করার জন�য নটিলাসের কোন প�রদর�শক ইনস�টল করা নেই।"
 
-#: src/nautilus-window-manage-views.c:1367
+#: src/nautilus-window-manage-views.c:1353
+#, fuzzy
 msgid "The location is not a folder."
-msgstr "অবস�থানটি ফোল�ডার নয়।"
+msgstr "\"%s\" অবস�থানের কোন অস�তিত�ব নেই।"
 
 # FIXME
-#: src/nautilus-window-manage-views.c:1394
+#: src/nautilus-window-manage-views.c:1380
 #, c-format
 msgid "Nautilus cannot handle %s: locations."
 msgstr "%s: অবস�থানকে প�রদর�শন করার ক�ষমতা নটিলাসের নেই।"
 
-#: src/nautilus-window-manage-views.c:1429
+#: src/nautilus-window-manage-views.c:1415
 msgid "Check that your proxy settings are correct."
 msgstr "প�রক�সির বৈশিষ�ট�যাবলি ঠিক আছে কিনা তা পরীক�ষা কর�ন।"
 
-#: src/nautilus-window-manage-views.c:1434
+#: src/nautilus-window-manage-views.c:1420
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
 "browser."
 msgstr ""
-"�স.�ম.বি. মাস�টার ব�রাউজারের সাথে যোগাযোগ করতে না পারায় \"%s\" প�রদর�শন করা "
-"যাচ�ছে না।"
+"�স�মবি মাস�টার ব�রাউজারের সাথে যোগাযোগ করতে না পারায় \"%s\" প�রদর�শন করা যাচ�ছে "
+"না।"
 
-#: src/nautilus-window-manage-views.c:1437
+#: src/nautilus-window-manage-views.c:1423
 msgid "Check that an SMB server is running in the local network."
-msgstr "স�থানীয় নেটওয়ার�কে কোন �স.�ম.বি. সার�ভার চলছে কিনা তা নিশ�চিত হোন।"
+msgstr "স�থানীয় নেটওয়ার�কে কোন �স�মবি সার�ভার চলছে কিনা তা নিশ�চিত হোন।"
 
-#: src/nautilus-window-manage-views.c:1442
+#: src/nautilus-window-manage-views.c:1428
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "নটিলাস \"%s\"-কে প�রদর�শন করতে পারছে না।"
 
-#: src/nautilus-window-manage-views.c:1444
+#: src/nautilus-window-manage-views.c:1430
 msgid "Please select another viewer and try again."
 msgstr "অন�গ�রহপূর�বক অপর �কটি প�রদর�শক বেছে নিয়ে প�নরায় চেষ�টা কর�ন।"
 
-#: src/nautilus-window-menus.c:177
+#: src/nautilus-window-menus.c:175
 msgid "Go to the location specified by this bookmark"
 msgstr "গন�তব�য ব�কমার�ক দ�বারা নির�দেশিত অবস�থান"
 
-#: src/nautilus-window-menus.c:409
+#: src/nautilus-window-menus.c:407
 msgid ""
 "Nautilus is free software; you can redistribute it and/or modify \n"
 "it under the terms of the GNU General Public License as published by \n"
 "the Free Software Foundation; either version 2 of the License, or \n"
 "(at your option) any later version."
 msgstr ""
-"নটিলাস �কটি ফ�রী সফটওয়�যার; ফ�রী সফটওয়�যার ফাউন�ডেশন কর�তৃক প�রকাশিত গনিউ জেনারেল \n"
-"পাবলিক লাইসেন�সের শর�ত মেনে আপনি �কে প�নঃবিতরণ �বং/বা পরিবর�তন করতে পারেন; \n"
-"�ক�ষেত�রে উল�লিখিত লাইসেন�সের ২য় বা তার পরবর�তী কোন সংস�করণ (আপনার ইচ�ছান�সারে) \n"
-"অন�সরণ করতে হবে।"
 
-#: src/nautilus-window-menus.c:413
+#: src/nautilus-window-menus.c:411
 msgid ""
 "Nautilus is distributed in the hope that it will be useful, \n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of \n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the \n"
 "GNU General Public License for more details."
 msgstr ""
-"নটিলাসকে �ই আশায় বিতরণ করা হচ�ছে যে �টি আপনার উপকারে আসবে, তবে � ব�যাপারে "
-"কোন \n"
-"নিশ�চয়তা (Warranty) দেওয়া হচ�ছে না; �ক�ষেত�রে �মনকি �র বিক�রয়যোগ�যতা "
-"(MERCHANTABILITY) \n"
-"বা নির�দিষ�ট কোন কাজের উপযোগীতা সম�পর�কেও কোন নিশ�চয়তাও দেওয়া হচ�ছে না। \n"
-"বিস�তারিত জানার জন�য গনিউ জেনারেল পাবলিক লাইসেন�স দেখ�ন।"
-
-#: src/nautilus-window-menus.c:417
+
+#: src/nautilus-window-menus.c:415
 msgid ""
 "You should have received a copy of the GNU General Public License \n"
 "along with Nautilus; if not, write to the Free Software Foundation, Inc., \n"
 "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
-"নটিলাসের সাথে আপনার গনিউ জেনারেল পাবলিক লাইসেন�সের �কটি অন�লিপি \n"
-"পাওয়ার কথা; না পেয়ে থাকলে �ই ঠিকানায় লিখ�ন - ফ�রী সফটওয়�যার ফাউন�ডেশন, ইঙ�ক., \n"
-"৫৯ টেম�পল প�যালেস, স�য�ট ৩৩০, বোস�টন, �ম.�.  ০২১১১-১৩০৭  ইউ.�স.�."
 
-#: src/nautilus-window-menus.c:446
+#: src/nautilus-window-menus.c:444
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
 msgstr ""
-"নটিলাস গনোমের জন�য �কটি  গ�রাফিকাল শেল যা ফাইল ও সিস�টেমের অন�যান�য অংশ ব�যবহার "
+"নটিলাস গনোমের জন�য �কটি  গ�রাফিক�যাল শেল যা ফাইল ও সিস�টেমের অন�যান�য অংশ ব�যবহার "
 "করা সহজ করে তোলে।"
 
-#: src/nautilus-window-menus.c:450
+#: src/nautilus-window-menus.c:448
 msgid "Copyright © 1999-2005 The Nautilus authors"
-msgstr "কপিরাইট © ১৯৯৯-২০০৫ নটিলাসের লেখকগণ"
+msgstr ""
 
-#: src/nautilus-window-menus.c:455
+#: src/nautilus-window-menus.c:453
+#, fuzzy
 msgid "translator-credits"
 msgstr "গনোম বাংলা অন�বাদ প�রকল�পের পক�ষে, প�রজ�ঞা [ Progga@BengaLinux.Org ]"
 
-#: src/nautilus-window-menus.c:595
+#: src/nautilus-window-menus.c:590
 msgid "_File"
 msgstr "ফাইল (_ফ)"
 
 #. name, stock id, label
-#: src/nautilus-window-menus.c:596
+#: src/nautilus-window-menus.c:591
 msgid "_Edit"
 msgstr "সম�পাদন (_ম)"
 
 #. name, stock id, label
-#: src/nautilus-window-menus.c:597
+#: src/nautilus-window-menus.c:592
 msgid "_View"
 msgstr "দৃশ�য (_দ)"
 
 #. name, stock id, label
-#: src/nautilus-window-menus.c:598
+#: src/nautilus-window-menus.c:593
 msgid "_Help"
 msgstr "সহায়িকা (_স)"
 
 #. name, stock id, label
 #. name, stock id
-#: src/nautilus-window-menus.c:600
+#: src/nautilus-window-menus.c:595
 msgid "_Close"
 msgstr "বন�ধ (_ব)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:601
+#: src/nautilus-window-menus.c:596
 msgid "Close this folder"
 msgstr "�ই ফোল�ডারটি বন�ধ করো"
 
-#: src/nautilus-window-menus.c:604
+#: src/nautilus-window-menus.c:599
 msgid "_Backgrounds and Emblems..."
 msgstr "পটভূমি �বং প�রতীক (_প)"
 
-#: src/nautilus-window-menus.c:605
+#: src/nautilus-window-menus.c:600
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -5801,178 +5988,197 @@ msgstr ""
 "নটিলাসের চেহারা ইচ�ছামাফিক পরিবর�তনের জন�য যে সব প�যাটার�ন, রং ও প�রতীক ব�যবহার করা "
 "যাবে তাদেরকে প�রদর�শন করো"
 
-#: src/nautilus-window-menus.c:608
+#: src/nautilus-window-menus.c:603
 msgid "Prefere_nces"
 msgstr "পছন�দ (_প)"
 
-#: src/nautilus-window-menus.c:609
+#: src/nautilus-window-menus.c:604
 msgid "Edit Nautilus preferences"
 msgstr "নটিলাসের বৈশিষ�ট�যাবলী সম�পাদন করো"
 
-#: src/nautilus-window-menus.c:611
+#: src/nautilus-window-menus.c:606
 msgid "_Undo"
 msgstr "বাতিল করা (_ব)"
 
 #. name, stock id, label
-#: src/nautilus-window-menus.c:612
+#: src/nautilus-window-menus.c:607
 msgid "Undo the last text change"
 msgstr "টেক�সটের ওপর সবর�শেষ যে পরিবর�তন করা হয়েছে তা বাতিল করো"
 
-#: src/nautilus-window-menus.c:614
+#: src/nautilus-window-menus.c:609
 msgid "Open _Parent"
 msgstr "উর�ধ�বস�থ ফোল�ডার খোলো (_ট)"
 
 #. name, stock id, label
-#: src/nautilus-window-menus.c:615
+#: src/nautilus-window-menus.c:610
 msgid "Open the parent folder"
 msgstr "উর�ধ�বস�থ ফোল�ডার খোলো"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:621
+#: src/nautilus-window-menus.c:616
 msgid "_Stop"
 msgstr "স�থগিত (_গ)"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:625
+#: src/nautilus-window-menus.c:620
 msgid "_Reload"
 msgstr "রিলোড (_ল)"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:629
+#: src/nautilus-window-menus.c:624
 msgid "_Contents"
 msgstr "সহায়িকা সূচি (_স)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:630
+#: src/nautilus-window-menus.c:625
 msgid "Display Nautilus help"
 msgstr "নটিলাসের সহায়িকা প�রদর�শন করো"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:633
+#: src/nautilus-window-menus.c:628
 msgid "_About"
 msgstr "পরিচিতি (_প)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:634
+#: src/nautilus-window-menus.c:629
 msgid "Display credits for the creators of Nautilus"
 msgstr "যারা নটিলাস তৈরি করেছেন তা�দের স�বীকৃতি তালিকা প�রদর�শন করো"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:637
+#: src/nautilus-window-menus.c:632
 msgid "Zoom _In"
 msgstr "বড় করে দেখাও (_ব)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:638 src/nautilus-zoom-control.c:96
+#: src/nautilus-window-menus.c:633 src/nautilus-zoom-control.c:97
 msgid "Show the contents in more detail"
 msgstr "সবকিছ� আরো বিস�তারিতভাবে প�রদর�শন করো"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:649
+#: src/nautilus-window-menus.c:636
 msgid "Zoom _Out"
 msgstr "ছোট করে দেখাও (_ছ)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:650 src/nautilus-zoom-control.c:97
+#: src/nautilus-window-menus.c:637 src/nautilus-zoom-control.c:98
 msgid "Show the contents in less detail"
 msgstr "কোন কিছ�র বিস�তারিত বিবরণ প�রদর�শনের প�রয়োজন নেই "
 
 #. name, stock id
-#: src/nautilus-window-menus.c:657
+#: src/nautilus-window-menus.c:640
 msgid "Normal Si_ze"
 msgstr "স�বাভাবিক আকার (_আ)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:658
+#: src/nautilus-window-menus.c:641
 msgid "Show the contents at the normal size"
 msgstr "সবকিছ�কে তাদের স�বাভাবিক আকারে দেখাও"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:661
+#: src/nautilus-window-menus.c:644
 msgid "Connect to _Server..."
 msgstr "সার�ভারের সাথে সংযোগ স�থাপন করো... (_স)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:662
+#: src/nautilus-window-menus.c:645
+#, fuzzy
 msgid "Set up a connection to a network server"
-msgstr "কোন �কটি নেটওয়ার�ক সার�ভারের সাথে সংযোগ স�থাপন করো"
+msgstr "�ই সার�ভারের সাথে �কটি স�থায়ী সংযোগ স�থাপন করো"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:665
+#: src/nautilus-window-menus.c:648
 msgid "_Home"
 msgstr "ব�যক�তিগত ফোল�ডার (_ব)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:666
+#: src/nautilus-window-menus.c:649
+#, fuzzy
 msgid "Go to the home folder"
-msgstr "গন�তব�য ব�যক�তিগত ফোল�ডার"
+msgstr "গন�তব�য আবর�জনার ফোল�ডার"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:669
+#: src/nautilus-window-menus.c:652
 msgid "_Computer"
 msgstr "কম�পিউটার (_ক)"
 
-# FIXME
 #. label, accelerator
-#: src/nautilus-window-menus.c:670
+#: src/nautilus-window-menus.c:653
+#, fuzzy
 msgid "Go to the computer location"
-msgstr "গন�তব�য কম�পিউটার অবস�থান"
+msgstr "গন�তব�য ব�যক�তিগত ফোল�ডার"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:673
+#: src/nautilus-window-menus.c:656
+#, fuzzy
 msgid "T_emplates"
 msgstr "ছা�দ (_ছ)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:674
+#: src/nautilus-window-menus.c:657
+#, fuzzy
 msgid "Go to the templates folder"
 msgstr "গন�তব�য ছা�দ সংরক�ষণকারী ফোল�ডার"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:677
+#: src/nautilus-window-menus.c:660
 msgid "_Trash"
 msgstr "আবর�জনার বাক�স (_আ)"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:678
+#: src/nautilus-window-menus.c:661
 msgid "Go to the trash folder"
 msgstr "গন�তব�য আবর�জনার ফোল�ডার"
 
 #. name, stock id
-#: src/nautilus-window-menus.c:681
+#: src/nautilus-window-menus.c:664
+#, fuzzy
 msgid "CD/_DVD Creator"
-msgstr "সিডি/ডিভিডি প�রস�ত�তকারক (_ড)"
+msgstr "সিডি/ডিভিডি তৈরিকারক"
 
 #. label, accelerator
-#: src/nautilus-window-menus.c:682
+#: src/nautilus-window-menus.c:665
 msgid "Go to the CD/DVD Creator"
 msgstr "গন�তব�য সিডি/ডিভিডি প�রস�ত�তকারক"
 
-#: src/nautilus-window-menus.c:708
+#: src/nautilus-window-menus.c:691
 msgid "_Up"
 msgstr "উপর (_উ)"
 
-#: src/nautilus-zoom-control.c:84
-msgid "Zoom In"
-msgstr "বিবর�ধন"
+#: src/nautilus-window.c:655
+#, c-format
+msgid "Display this location with \"%s\""
+msgstr "\"%s\"-�র সাহায�যে �ই অবস�থানটি প�রদর�শন করো"
+
+#: src/nautilus-window.c:1452
+msgid "Application"
+msgstr "অ�যাপলিকেশন"
+
+#: src/nautilus-window.c:1453
+msgid "The NautilusApplication associated with this window."
+msgstr "�ই উইন�ডোর সাথে সম�পর�কিত NautilusApplication।"
 
 #: src/nautilus-zoom-control.c:85
-msgid "Zoom Out"
-msgstr "ছোট করো"
+msgid "Zoom In"
+msgstr "বড় করে প�রদর�শন"
 
 #: src/nautilus-zoom-control.c:86
+msgid "Zoom Out"
+msgstr "ছোট করে প�রদর�শন"
+
+#: src/nautilus-zoom-control.c:87
+#, fuzzy
 msgid "Zoom to Default"
-msgstr "ডিফল�ট জ�মমাত�রা ব�যবহার করো"
+msgstr "পর�দার সমান আকারে প�রদর�শন"
 
-#: src/nautilus-zoom-control.c:98
+#: src/nautilus-zoom-control.c:99
 msgid "Show in the default detail level"
-msgstr "ডিফল�ট সূক�ষতার-মাত�রায় প�রদর�শন করো"
+msgstr ""
 
-#: src/nautilus-zoom-control.c:801
+#: src/nautilus-zoom-control.c:802
 msgid "Zoom"
 msgstr "জ�ম"
 
-#: src/nautilus-zoom-control.c:807
+#: src/nautilus-zoom-control.c:808
 msgid "Set the zoom level of the current view"
 msgstr "বর�তমান দৃশ�যের জ�ম মাত�রা নির�ধারণ করো"
 
@@ -5983,3 +6189,517 @@ msgstr "নেটওয়ার�ক সার�ভার"
 #: src/network-scheme.desktop.in.h:2
 msgid "View your network servers in the Nautilus file manager"
 msgstr "আপনার ব�যবহৃত নেটওয়ার�ক সার�ভারগ�লোকে নটিলাস ফাইল ব�যবস�থাপক থেকে দেখ�ন"
+
+# FIXME: �ইটা আবার কি জিনিষ ?
+#~ msgid "Allaire"
+#~ msgstr "আলেয়ার"
+
+#~ msgid "Binary Freedom"
+#~ msgstr "বাইনারি স�বাধীনতা"
+
+#~ msgid "Borland"
+#~ msgstr "বোরল�যান�ড"
+
+#~ msgid "CNET Computers.com"
+#~ msgstr "সীনেট Computers.com"
+
+#~ msgid "CNET Linux Center"
+#~ msgstr "সীনেট লিনাক�স কেন�দ�র"
+
+#~ msgid "CollabNet"
+#~ msgstr "কোলাবনেট"
+
+#~ msgid "Compaq"
+#~ msgstr "কম�প�যাক"
+
+#~ msgid "Conectiva"
+#~ msgstr "কানেক�টিভা"
+
+#~ msgid "Covalent"
+#~ msgstr "কোভ�যালেন�ট"
+
+#~ msgid "Debian.org"
+#~ msgstr "Debian.org"
+
+#~ msgid "Dell"
+#~ msgstr "ডেল"
+
+#~ msgid "Freshmeat.net"
+#~ msgstr "Freshmeat.net"
+
+#~ msgid "GNOME.org"
+#~ msgstr "GNOME.org"
+
+#~ msgid "GNU.org"
+#~ msgstr "GNU.org"
+
+#~ msgid "Hardware"
+#~ msgstr "হার�ডওয়ার"
+
+#~ msgid "International"
+#~ msgstr "আন�তর�জাতিক"
+
+#~ msgid "Linux Documentation Project"
+#~ msgstr "লিনাক�স ডক�মেন�টেশন প�রজেক�ট"
+
+#~ msgid "Linux One"
+#~ msgstr "লিনাক�স ওয়ান"
+
+#~ msgid "Linux Online"
+#~ msgstr "লিনাক�স অনলাইন"
+
+#~ msgid "Linux Resources"
+#~ msgstr "লিনাক�স বিষয়ক সফটওয়ার, লেখালেখি ইত�যাদি"
+
+#~ msgid "Linux Weekly News"
+#~ msgstr "সাপ�তাহিক লিনাক�স বার�তা"
+
+#~ msgid "LinuxNewbie.org"
+#~ msgstr "LinuxNewbie.org"
+
+#~ msgid "LinuxOrbit.com"
+#~ msgstr "LinuxOrbit.com"
+
+#~ msgid "MandrakeSoft"
+#~ msgstr "ম�যানড�রেকসফট"
+
+#~ msgid "Netraverse"
+#~ msgstr "নেট�রাভার�স"
+
+#~ msgid "News and Media"
+#~ msgstr "সংবাদ ও প�রচার মাধ�যম"
+
+#~ msgid "O'Reilly"
+#~ msgstr "ও'রেইলি"
+
+#~ msgid "OSDN"
+#~ msgstr "ও.�স.ডি.�ন. (OSDN)"
+
+#~ msgid "Open Source Asia"
+#~ msgstr "ওপেন সোর�স �শিয়া"
+
+#~ msgid "OpenOffice"
+#~ msgstr "ওপেনঅফিস"
+
+#~ msgid "Penguin Computing"
+#~ msgstr "পেঙ�গ�ইন কম�পিউটিং"
+
+#~ msgid "Rackspace"
+#~ msgstr "র�যাকস�পেস"
+
+#~ msgid "Red Hat"
+#~ msgstr "রেড হ�যাট"
+
+#~ msgid "Red Hat Network"
+#~ msgstr "রেডহ�যাট নেটওয়ার�ক"
+
+#~ msgid "RedFlag Linux"
+#~ msgstr "রেডফ�ল�যাগ লিনাক�স"
+
+#~ msgid "SourceForge"
+#~ msgstr "সোর�সফোর�জ"
+
+#~ msgid "SuSE"
+#~ msgstr "স�সে"
+
+#~ msgid "Sun StarOffice"
+#~ msgstr "সান স�টারঅফিস"
+
+#~ msgid "Sun Wah Linux"
+#~ msgstr "সান ওয়াহ লিনাক�স"
+
+#~ msgid "Web Services"
+#~ msgstr "ওয়েব সার�ভিস"
+
+#~ msgid "Ximian"
+#~ msgstr "জিমিয়ান"
+
+#~ msgid "ZDNet Linux Hardware Database"
+#~ msgstr "জেডনেট লিনাক�স হার�ডওয়ার ডেটাবেস"
+
+#~ msgid "ZDNet Linux Resource Center"
+#~ msgstr "জেডনেট লিনাক�স কেন�দ�র"
+
+# FIXME: �টা ঠিক ব��লাম না ;-(
+#~ msgid "Zero-Knowledge"
+#~ msgstr "শূন�য-অভিজ�ঞতা"
+
+#~ msgid "Files thrown out:"
+#~ msgstr "যে সব ফাইলকে ফেলে দেওয়া হয়েছে:"
+
+#~ msgid "Files moved:"
+#~ msgstr "যে সব ফাইলকে স�থানান�তর করা হয়েছে:"
+
+#~ msgid "Files linked:"
+#~ msgstr "যেসব ফাইলের লিঙ�ক তৈরি করা হয়েছে:"
+
+#~ msgid "Files copied:"
+#~ msgstr "কপিকৃত ফাইল:"
+
+#~ msgid "Icons Viewer"
+#~ msgstr "আইকন প�রদর�শক"
+
+#~ msgid "List Viewer"
+#~ msgstr "তালিকা প�রদর�শক"
+
+# FIXME
+#~ msgid "Nautilus Tree View"
+#~ msgstr "নটিলাসের ট�রি ( Tree ) দৃশ�য"
+
+#~ msgid "Nautilus Tree side pane"
+#~ msgstr "নটিলাসের ট�রি সাইড পেন"
+
+#~ msgid "Nautilus file manager component that shows a scrollable list"
+#~ msgstr ""
+#~ "নটিলাস ফাইল ব�যবস�থাপকের �কটি কম�পোনেন�ট যা স�ক�রল ( Scroll ) করা যায় �রূপ "
+#~ "তালিকা প�রদর�শন করে"
+
+#~ msgid ""
+#~ "Nautilus file manager component that shows a scrollable list for search "
+#~ "results"
+#~ msgstr ""
+#~ "নটিলাস ফাইল ব�যবস�থাপকের �কটি কম�পোনেন�ট যা অন�সন�ধানের ফলাফল �রূপ তালিকায় "
+#~ "প�রদর�শন করে যা স�ক�রল ( Scroll ) করা যায়"
+
+#~ msgid ""
+#~ "Nautilus file manager component that shows a two-dimensional icon space"
+#~ msgstr ""
+#~ "নটিলাস ফাইল ব�যবস�থাপকের �কটি কম�পোনেন�ট যা দ�বিমাত�রিক আইকন তালিকা প�রদর�শন করে"
+
+# FIXME: ইংরেজি পঙ�‌ক�তির অর�থ স�পষ�ট না
+#~ msgid "Nautilus file manager component that shows icons on the desktop"
+#~ msgstr "নটিলাস ফাইল ব�যবস�থাপকের �কটি কম�পোনেন�ট যা ডেস�কটপে আইকন প�রদর�শন করে"
+
+#~ msgid "Nautilus file manager desktop icon view"
+#~ msgstr "নটিলাস ফাইল ব�যবস�থাপকের ডেস�কটপ আইকন দৃশ�য"
+
+#~ msgid "Nautilus file manager icon view"
+#~ msgstr "নটিলাস ফাইল ব�যবস�থাপকের আইকন দৃশ�য"
+
+#~ msgid "Nautilus file manager list view"
+#~ msgstr "নটিলাস ফাইল ব�যবস�থাপকের তালিকা দৃশ�য"
+
+# FIXME: ভাল শোনাচ�ছে না ;-(
+#~ msgid "Nautilus file manager search results list view"
+#~ msgstr "নটিলাস ফাইল ব�যবস�থাপকের অন�সন�ধানের ফলাফল প�রদর�শক তালিকা দৃশ�য"
+
+#~ msgid "Search List"
+#~ msgstr "অন�সন�ধান তালিকা"
+
+#~ msgid "View as Icons"
+#~ msgstr "আইকনের সাহায�যে প�রদর�শন করো"
+
+#~ msgid "View as List"
+#~ msgstr "তালিকার সাহায�যে প�রদর�শন করো"
+
+#~ msgid "View as _Icons"
+#~ msgstr "আইকনের সাহায�যে প�রদর�শন করো (_আ)"
+
+#~ msgid "View as _List"
+#~ msgstr "তালিকার সাহায�যে প�রদর�শন করো (_ত)"
+
+#~ msgid "_Empty"
+#~ msgstr "ফা�কা করো (_ক)"
+
+#~ msgid "Use the default background for this location"
+#~ msgstr "�খানে ডিফল�ট পটভূমি ব�যবহার করো"
+
+#~ msgid "_Clear History"
+#~ msgstr "ব�রাউজের-ইতিহাস ম�ছে ফেলো (_ম)"
+
+#~ msgid "File Browser: %s"
+#~ msgstr "ফাইল ব�রাউজার: %s"
+
+#~ msgid "Copyright (C) 1999-2001 Eazel, Inc."
+#~ msgstr "কপিরাইট (কপিরাইট) ১৯৯৯-২০০১ ইজেল, ইঙ�ক।"
+
+#~ msgid "CD _Creator"
+#~ msgstr "সিডি প�রস�ত�তকারক (_স)"
+
+#~ msgid "Open with..."
+#~ msgstr "�টি ব�যবহার করে খোলো..."
+
+# Untranslated string in version 2.8 = 2.
+# Untranslated string in version 2.8 = 2.
+#~ msgid "bonobo_ui_init() failed."
+#~ msgstr "bonobo_ui_init() ব�যর�থ হয়েছে।"
+
+#~ msgid "Factory for Nautilus component adapter factories"
+#~ msgstr "নটিলাস কম�পোনেন�ট অ�যাডাপ�টর ফ�যাক�টরি তৈরির ফ�যাক�টরি"
+
+#~ msgid "Factory for Nautilus component adapter factories "
+#~ msgstr "নটিলাস কম�পোনেন�ট অ�যাডাপ�টর ফ�যাক�টরি তৈরির ফ�যাক�টরি "
+
+#~ msgid ""
+#~ "Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+#~ "look like Nautilus Views"
+#~ msgstr ""
+#~ "যে সব অবজেক�ট সাধারণ বনোবো নিয়ন�ত�রণ বা �ম�বেডেবলকে নটিলাস উপযোগী করে দেখায়, "
+#~ "তাদের ফ�যাক�টরি"
+
+#~ msgid "Nautilus component adapter factory"
+#~ msgstr "নটিলাস কম�পোনেন�ট অ�যাডাপ�টর ফ�যাক�টরি"
+
+# FIXME
+#~ msgid "Nautilus Emblem side pane"
+#~ msgstr "নটিলাসের প�রতীকধারী সাইড পেন"
+
+#~ msgid "Nautilus Emblem view"
+#~ msgstr "নটিলাস প�রতীকের দৃশ�য"
+
+#~ msgid "History side pane"
+#~ msgstr "ব�রাউজ-ইতিহাস প�রদর�শনকারী সাইড পেন"
+
+#~ msgid "History side pane for Nautilus"
+#~ msgstr "নটিলাসের ব�রাউজ-ইতিহাস প�রদর�শনকরী সাইড পেন"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "বর�তমানে প�রদর�শিত ইউ.আর.আই (URI)"
+
+# FIXME
+#~ msgid "Image Properties content view component"
+#~ msgstr "ছবির বৈশিষ�ট�য প�রদর�শক কম�পোনেন�ট"
+
+#~ msgid "Nautilus Image Properties view"
+#~ msgstr "নটিলাসের ছবির বৈশিষ�ট�য প�রদর�শক"
+
+#~ msgid "Notes side pane"
+#~ msgstr "নোট প�রদর�শক পেন"
+
+#~ msgid "Notes side pane for Nautilus"
+#~ msgstr "নটিলাসের নোট প�রদর�শক পেন"
+
+#~ msgid "Factory for text view"
+#~ msgstr "টেক�সট দৃশ�য ফ�যাক�টরি"
+
+#~ msgid "Text"
+#~ msgstr "টেক�সট"
+
+#~ msgid "Text Viewer"
+#~ msgstr "টেক�সট প�রদর�শক"
+
+#~ msgid "Text view"
+#~ msgstr "টেক�সট দৃশ�য"
+
+#~ msgid "Text view factory"
+#~ msgstr "টেক�সট দৃশ�য ফ�যাক�টরি"
+
+#~ msgid "View as Text"
+#~ msgstr "টেক�সট হিসেবে প�রদর�শন করো"
+
+# FIXME
+#~ msgid "animation to indicate on-going activity"
+#~ msgstr "চলমান কাজ সম�পর�কে ধারনা দেওয়ার জন�য অ�যানিমেশন ব�যবহার করো"
+
+#~ msgid "throbber factory"
+#~ msgstr "থ�রোবার ফ�যাক�টরি"
+
+#~ msgid "throbber object factory"
+#~ msgstr "থ�রোবার অবজেক�ট ফ�যাক�টরি"
+
+#~ msgid "C_lear Text"
+#~ msgstr "টেক�সট ম�ছে ফেলো (_ল)"
+
+#~ msgid "Cut Text"
+#~ msgstr "টেক�সট কাট করো"
+
+#~ msgid "Remove the selected text without putting it on the clipboard"
+#~ msgstr "ক�লিপবোর�ডে না নিয়েই চিহ�নিত টেক�সটকে ম�ছে ফেলো"
+
+#~ msgid "Hide default bookmarks in the bookmark menu"
+#~ msgstr "ব�কমার�ক মেন�তে ডিফল�ট ব�কমার�কগ�লোকে ল�কিয়ে রাখো"
+
+#~ msgid ""
+#~ "If set to true, then Nautilus will just show the user's bookmarks in the "
+#~ "bookmark menu."
+#~ msgstr ""
+#~ "�টির মান সত�য (true) হলে ব�কমার�ক মেন�তে নটিলাস শ�ধ� ব�যবহারকারীর ব�কমার�কগ�লোকে "
+#~ "দেখাবে।"
+
+#~ msgid "%s Viewer"
+#~ msgstr "%s প�রদর�শক"
+
+#~ msgid "Could not complete specified action:  %s"
+#~ msgstr "উল�লেখকৃত কাজটি সম�পন�ন করা যায় নি:  %s"
+
+#~ msgid "Could not complete specified action."
+#~ msgstr "উল�লেখকৃত কাজটি সম�পন�ন করা যায় নি।"
+
+#~ msgid "Use the default desktop background"
+#~ msgstr "ডেস�কটপে ডিফল�ট পটভূমি ব�যবহার করো"
+
+#~ msgid "Edit Launcher"
+#~ msgstr "লঞ�চার সম�পাদন করো"
+
+#~ msgid "Edit the launcher information"
+#~ msgstr "লঞ�চারের তথ�য সম�পাদন করো"
+
+#~ msgid "Format the selected volume"
+#~ msgstr "চিহ�নিত ভলিউমটিকে ফরম�যাট করো"
+
+#~ msgid "Medi_a Properties"
+#~ msgstr "মিডিয়ার বৈশিষ�ট�যাবলী (_ম)"
+
+# FIXME
+#~ msgid "Prot_ect"
+#~ msgstr "স�রক�ষা (_স)"
+
+#~ msgid "Show media properties for the selected volume"
+#~ msgstr "চিহ�নিত ভলিউমের মিডিয়া বৈশিষ�ট�যাবলী প�রদর�শন করো"
+
+#~ msgid "_Format"
+#~ msgstr "বিন�যাস (_ব)"
+
+#~ msgid "One of the side panels encountered an error and can't continue."
+#~ msgstr "কোন �কটি সাইড প�যানেলে সমস�যা হয়েছে �বং সেটি আর চলতে পারছে না।"
+
+#~ msgid "Unfortunately I couldn't tell which one."
+#~ msgstr "দ�র�ভাগ�যবশতঃ আমি বলতে পারছি না যে কোন সাইড প�যানেলটিতে � সমস�যা হয়েছে।"
+
+#~ msgid "The %s side panel encountered an error and can't continue."
+#~ msgstr "%s সাইড প�যানেলে সমস�যা হয়েছে �বং তা আর চলতে পারছে না।"
+
+#~ msgid "If this keeps happening, you might want to turn this panel off."
+#~ msgstr "যদি �রকম চলতেই থাকে, তবে আপনি প�যানেলটি বন�ধ করে দিতে পারেন।"
+
+# FIXME
+#~ msgid "Side Panel Failed"
+#~ msgstr "সাইড প�যানেল চলতে ব�যর�থ হয়েছে"
+
+#~ msgid "Side Pane"
+#~ msgstr "সাইড পেন"
+
+#~ msgid "Contains a side pane view"
+#~ msgstr "�কটি সাইড পেন দৃশ�য ধারন করে"
+
+#~ msgid "Back"
+#~ msgstr "পূর�বাবস�থান"
+
+#~ msgid "Find"
+#~ msgstr "অন�সন�ধান"
+
+#~ msgid "Forward"
+#~ msgstr "পরবর�তী"
+
+#~ msgid "Home"
+#~ msgstr "ব�যক�তিগত ফোল�ডার"
+
+#~ msgid "Reload"
+#~ msgstr "রিলোড"
+
+#~ msgid "Search this computer for files"
+#~ msgstr "�ই কম�পিউটারে ফাইল খো�জো"
+
+#~ msgid "Stop"
+#~ msgstr "স�থগিত"
+
+#~ msgid "Up"
+#~ msgstr "উপর"
+
+#~ msgid "Print"
+#~ msgstr "ম�দ�রণ"
+
+#~ msgid "Save"
+#~ msgstr "সংরক�ষণ"
+
+#~ msgid "Profile Dump"
+#~ msgstr "বিবরণী সংগ�রহ"
+
+# FIXME: �টা ঠিক ব��লাম না ;-(
+#~ msgid "Display the latest contents of the current location"
+#~ msgstr "বর�তমান অবস�থানের সর�বশেষ ফাইল তালিকা প�রদর�শন করো"
+
+#~ msgid "Go to Empty CD folder"
+#~ msgstr "গন�তব�য ফা�কা সিডির ফোল�ডার"
+
+#~ msgid "Go up one level"
+#~ msgstr "গন�তব�য �কধাপ উপরে"
+
+# FIXME
+#~ msgid "Report Profiling"
+#~ msgstr "বিবরণী তৈরি রিপোর�ট করো"
+
+# FIXME
+#~ msgid "Reset Profiling"
+#~ msgstr "বিবরণী তৈরির প�রক�রিয়া রিসেট করো"
+
+#~ msgid "Start Profiling"
+#~ msgstr "বিবরণী তৈরি আরম�ভ করো"
+
+#~ msgid "Stop Profiling"
+#~ msgstr "বিবরণী তৈরি বন�ধ করো"
+
+#~ msgid "Stop loading this location"
+#~ msgstr "�ই অবস�থানের ফাইল তালিকা পড়া বন�ধ করো"
+
+#~ msgid "_CD/DVD Creator"
+#~ msgstr "সিডি/ডিভিডি প�রস�ত�তকারক (_স)"
+
+#~ msgid "_Profiler"
+#~ msgstr "বিবরণী প�রস�ত�তকারক (_ফ)"
+
+#~ msgid "_Report Profiling"
+#~ msgstr "বিবরণী তৈরির রিপোর�ট দাও (_র)"
+
+#~ msgid "_Reset Profiling"
+#~ msgstr "বিবরণী তৈরির প�রক�রিয়া রিসেট করো (_স)"
+
+#~ msgid "_Start Profiling"
+#~ msgstr "বিবরণী তৈরি আরম�ভ করো (_আ)"
+
+#~ msgid "_Stop Profiling"
+#~ msgstr "বিবরণী তৈরির প�রক�রিয়া স�থগিত করো (_ত)"
+
+# FIXME
+#~ msgid "Go to Computer"
+#~ msgstr "কম�পিউটারে যাও"
+
+#~ msgid "a title"
+#~ msgstr "�কটি শিরোনাম"
+
+#~ msgid "the browse history"
+#~ msgstr "ব�রাউজের তালিকা"
+
+#~ msgid "the current selection"
+#~ msgstr "বর�তমান বাছাই"
+
+#~ msgid "the type of window the view is embedded in"
+#~ msgstr "দৃশ�যটি যে উইন�ডোতে সন�নিবিষ�ট, তার ধরন"
+
+#~ msgid "whether to show hidden files in the view"
+#~ msgstr "ল�ক�কায়িত ফাইল ভিউ-তে দেখানো হবে কিনা"
+
+#~ msgid "Application ID"
+#~ msgstr "অ�যাপলিকেশন আইডি"
+
+#~ msgid "The application ID of the window."
+#~ msgstr "�ই উইন�ডোর অ�যাপলিকেশন আইডি।"
+
+#~ msgid "Nautilus cannot determine what type of file it is."
+#~ msgstr "নটিলাস ব��তে পারছে না যে �টি কি ধরনের ফাইল।"
+
+#~ msgid ""
+#~ "Searching is unavailable right now, because you either have no index, or "
+#~ "the search service isn't running."
+#~ msgstr ""
+#~ "� ম�হূর�তে ফাইল খো�জা সম�ভব নয়, কারণ হয় ফাইলের কোন তালিকা নেই, অথবা ফাইল খো�জার "
+#~ "ব�যবস�থা নিষ�ক�রিয় রয়েছে।"
+
+#~ msgid ""
+#~ "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 ""
+#~ "মেড�সা ফাইল অন�সন�ধান প�রক�রিয়া সচল আছে কি না �বং যদি ফাইলের কোন তালিকা না "
+#~ "থাকে তবে মেড�সার ফাইল তালিকা তৈরির প�রক�রিয়াটি চলছে কি না তা নিশ�চিত হোন।"
+
+#~ msgid "Searching Unavailable"
+#~ msgstr "ফাইল অন�সন�ধানের প�রক�রিয়া সচল নেই"
+
+#~ msgid "Go back a few pages"
+#~ msgstr "গন�তব�য কয়েক পৃষ�ঠা পেছনে"
+
+#~ msgid "Go forward a number of pages"
+#~ msgstr "গন�তব�য কয়েক পৃষ�ঠা সামনে"
+
+#~ msgid "Try to fit in window"
+#~ msgstr "উইন�ডোতে আ�টানোর চেষ�টা করো"
diff --git a/po/eu.po b/po/eu.po
index ed07e5a73..608041b57 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,14 +2,14 @@
 # translation of nautilus.gnome-2-4.po to basque
 # Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
-# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2004, 2005.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-07 17:01+0200\n"
-"PO-Revision-Date: 2005-09-07 17:01+0200\n"
+"POT-Creation-Date: 2005-02-10 12:02+0100\n"
+"PO-Revision-Date: 2004-04-16 20:41+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,378 +18,543 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../data/browser.xml.h:1
+#: data/applications.desktop.in.h:1
+msgid "Applications"
+msgstr "Aplikazioak"
+
+#: data/applications.desktop.in.h:2
+msgid "Browse available software"
+msgstr "Arakatu erabilgarri dagoen softwarea"
+
+#: data/browser.xml.h:1
 msgid "Apparition"
 msgstr "Agerpena"
 
 #
-#: ../data/browser.xml.h:2
+#: data/browser.xml.h:2
 msgid "Art"
 msgstr "Artea"
 
-#: ../data/browser.xml.h:3
+#: data/browser.xml.h:3
 msgid "Azul"
 msgstr "Urdina"
 
-#: ../data/browser.xml.h:4
+#: data/browser.xml.h:4
 msgid "Black"
 msgstr "Beltza"
 
-#: ../data/browser.xml.h:5
+#: data/browser.xml.h:5
 msgid "Blue Ridge"
 msgstr "Erliebe urdina"
 
-#: ../data/browser.xml.h:6
+#: data/browser.xml.h:6
 msgid "Blue Rough"
 msgstr "Zimur urdina"
 
-#: ../data/browser.xml.h:7
+#: data/browser.xml.h:7
 msgid "Blue Type"
 msgstr "Urdin letraduna"
 
-#: ../data/browser.xml.h:8
+#: data/browser.xml.h:8
 msgid "Brushed Metal"
 msgstr "Metal pintatua"
 
-#: ../data/browser.xml.h:9
+#: data/browser.xml.h:9
 msgid "Bubble Gum"
 msgstr "Txiklea"
 
-#: ../data/browser.xml.h:10
+#: data/browser.xml.h:10
 msgid "Burlap"
 msgstr "Burlap"
 
 #
-#: ../data/browser.xml.h:11
+#: data/browser.xml.h:11
 msgid "C_olors"
 msgstr "K_oloreak"
 
 #
-#: ../data/browser.xml.h:12
+#: data/browser.xml.h:12
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../data/browser.xml.h:13
+#: data/browser.xml.h:13
 msgid "Camouflage"
 msgstr "Kamuflajea"
 
-#: ../data/browser.xml.h:14
+#: data/browser.xml.h:14
 msgid "Certified"
 msgstr "Ziurtatua"
 
-#: ../data/browser.xml.h:15
+#: data/browser.xml.h:15
 msgid "Chalk"
 msgstr "Klera"
 
-#: ../data/browser.xml.h:16
+#: data/browser.xml.h:16
 msgid "Charcoal"
 msgstr "Ikatza"
 
-#: ../data/browser.xml.h:17
+#: data/browser.xml.h:17
 msgid "Concrete"
 msgstr "Zementua"
 
-#: ../data/browser.xml.h:18
+#: data/browser.xml.h:18
 msgid "Cool"
 msgstr "Sekulakoa"
 
-#: ../data/browser.xml.h:19
+#: data/browser.xml.h:19
 msgid "Cork"
 msgstr "Artelazkia"
 
-#: ../data/browser.xml.h:20
+#: data/browser.xml.h:20
 msgid "Countertop"
 msgstr "Gainekoa"
 
-#: ../data/browser.xml.h:21
+#: data/browser.xml.h:21
 msgid "Danger"
 msgstr "Arriskua"
 
-#: ../data/browser.xml.h:22
+#: data/browser.xml.h:22
 msgid "Danube"
 msgstr "Danubioa"
 
-#: ../data/browser.xml.h:23
+#: data/browser.xml.h:23
 msgid "Dark Cork"
 msgstr "Artelazki beltza"
 
-#: ../data/browser.xml.h:24
+#: data/browser.xml.h:24
 msgid "Dark GNOME"
 msgstr "GNOME iluna"
 
-#: ../data/browser.xml.h:25
+#: data/browser.xml.h:25
 msgid "Deep Teal"
 msgstr "Anil sakona"
 
-#: ../data/browser.xml.h:26
+#: data/browser.xml.h:26
 msgid "Distinguished"
 msgstr "Nabarmendua"
 
 #
-#: ../data/browser.xml.h:27
+#: data/browser.xml.h:27
 msgid "Documents"
 msgstr "Dokumentuak"
 
-#: ../data/browser.xml.h:28
+#: data/browser.xml.h:28
 msgid "Dots"
 msgstr "Puntuak"
 
-#: ../data/browser.xml.h:29
+#: data/browser.xml.h:29
 msgid "Draft"
 msgstr "Zirriborroa"
 
-#: ../data/browser.xml.h:30
+#: data/browser.xml.h:30
 msgid "Drag a color to an object to change it to that color"
 msgstr "Arrastatu kolore bat objekturaino, kolore hori har dezan"
 
-#: ../data/browser.xml.h:31
+#: data/browser.xml.h:31
 msgid "Drag a pattern tile to an object to change it"
 msgstr "Arrastatu eredu bat objekturaino, eredu hori har dezan"
 
-#: ../data/browser.xml.h:32
+#: data/browser.xml.h:32
 msgid "Drag an emblem to an object to add it to the object"
 msgstr "Arrastatu ikur bat objekturaino, objektuak ikurra har dezan"
 
-#: ../data/browser.xml.h:33
+#: data/browser.xml.h:33
 msgid "Eclipse"
 msgstr "Eklipsea"
 
-#: ../data/browser.xml.h:34
+#: data/browser.xml.h:34
 msgid "Envy"
 msgstr "Inbidia"
 
-#: ../data/browser.xml.h:35 ../src/nautilus-emblem-sidebar.c:941
-#: ../src/nautilus-property-browser.c:1779
+#: data/browser.xml.h:35 src/nautilus-emblem-sidebar.c:941
+#: src/nautilus-property-browser.c:1731
 msgid "Erase"
 msgstr "Ezabatu"
 
-#: ../data/browser.xml.h:36
+#: data/browser.xml.h:36
 msgid "Favorite"
 msgstr "Gogokoa"
 
-#: ../data/browser.xml.h:37
+#: data/browser.xml.h:37
 msgid "Fibers"
 msgstr "Zuntzak"
 
-#: ../data/browser.xml.h:38
+#: data/browser.xml.h:38
 msgid "Fire Engine"
 msgstr "Gorri bizia"
 
-#: ../data/browser.xml.h:39
+#: data/browser.xml.h:39
 msgid "Fleur De Lis"
 msgstr "Lis lorea"
 
-#: ../data/browser.xml.h:40
+#: data/browser.xml.h:40
 msgid "Floral"
 msgstr "Loreak"
 
-#: ../data/browser.xml.h:41
+#: data/browser.xml.h:41
 msgid "Fossil"
 msgstr "Fosila"
 
-#: ../data/browser.xml.h:42
+#: data/browser.xml.h:42 icons/gnome/gnome.xml.h:2
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../data/browser.xml.h:43
+#: data/browser.xml.h:43
 msgid "Granite"
 msgstr "Granitoa"
 
-#: ../data/browser.xml.h:44
+#: data/browser.xml.h:44
 msgid "Grapefruit"
 msgstr "Pomeloa"
 
-#: ../data/browser.xml.h:45
+#: data/browser.xml.h:45
 msgid "Green Weave"
 msgstr "Ehun berdea"
 
-#: ../data/browser.xml.h:46
+#: data/browser.xml.h:46
 msgid "Ice"
 msgstr "Izotza"
 
-#: ../data/browser.xml.h:47
+#: data/browser.xml.h:47
 msgid "Important"
 msgstr "Garrantzitsua"
 
-#: ../data/browser.xml.h:48
+#: data/browser.xml.h:48
 msgid "Indigo"
 msgstr "Indigoa"
 
-#: ../data/browser.xml.h:49
+#: data/browser.xml.h:49
 msgid "Leaf"
 msgstr "Hostoa"
 
-#: ../data/browser.xml.h:50
+#: data/browser.xml.h:50
 msgid "Lemon"
 msgstr "Limoia"
 
 #
-#: ../data/browser.xml.h:51
+#: data/browser.xml.h:51
 msgid "Mail"
 msgstr "Posta"
 
-#: ../data/browser.xml.h:52
+#: data/browser.xml.h:52
 msgid "Mango"
 msgstr "Mangoa"
 
-#: ../data/browser.xml.h:53
+#: data/browser.xml.h:53
 msgid "Manila Paper"
 msgstr "Manila papera"
 
-#: ../data/browser.xml.h:54
+#: data/browser.xml.h:54
 msgid "Moss Ridge"
 msgstr "Goroldioa"
 
-#: ../data/browser.xml.h:55
+#: data/browser.xml.h:55
 msgid "Mud"
 msgstr "Buztina"
 
-#: ../data/browser.xml.h:56
+#: data/browser.xml.h:56
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../data/browser.xml.h:57
+#: data/browser.xml.h:57
 msgid "New"
 msgstr "Berria"
 
-#: ../data/browser.xml.h:58
+#: data/browser.xml.h:58
 msgid "Numbers"
 msgstr "Zenbakiak"
 
-#: ../data/browser.xml.h:59
+#: data/browser.xml.h:59
 msgid "OK"
 msgstr "Ados"
 
-#: ../data/browser.xml.h:60
+#: data/browser.xml.h:60
 msgid "Ocean Strips"
 msgstr "Ozeano-marrak"
 
-#: ../data/browser.xml.h:61
+#: data/browser.xml.h:61
 msgid "Oh No"
 msgstr "Ai Ez"
 
-#: ../data/browser.xml.h:62
+#: data/browser.xml.h:62
 msgid "Onyx"
 msgstr "Onizea"
 
-#: ../data/browser.xml.h:63
+#: data/browser.xml.h:63
 msgid "Orange"
 msgstr "Laranja"
 
 #
-#: ../data/browser.xml.h:64
+#: data/browser.xml.h:64
 msgid "Package"
 msgstr "Paketea"
 
-#: ../data/browser.xml.h:65
+#: data/browser.xml.h:65
 msgid "Pale Blue"
 msgstr "Urdin argia"
 
-#: ../data/browser.xml.h:66
+#: data/browser.xml.h:66
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: ../data/browser.xml.h:67
+#: data/browser.xml.h:67
 msgid "Pictures"
 msgstr "Irudiak"
 
-#: ../data/browser.xml.h:68
+#: data/browser.xml.h:68
 msgid "Purple Marble"
 msgstr "Marmol morea"
 
-#: ../data/browser.xml.h:69
+#: data/browser.xml.h:69
 msgid "Ridged Paper"
 msgstr "Paper izurtua"
 
-#: ../data/browser.xml.h:70
+#: data/browser.xml.h:70
 msgid "Rough Paper"
 msgstr "Paper zimurtua"
 
-#: ../data/browser.xml.h:71
+#: data/browser.xml.h:71
 msgid "Ruby"
 msgstr "Errubia"
 
-#: ../data/browser.xml.h:72
+#: data/browser.xml.h:72
 msgid "Sea Foam"
 msgstr "Itsas bitsa"
 
-#: ../data/browser.xml.h:73
+#: data/browser.xml.h:73
 msgid "Shale"
 msgstr "Arbela"
 
-#: ../data/browser.xml.h:74
+#: data/browser.xml.h:74
 msgid "Silver"
 msgstr "Zilarra"
 
-#: ../data/browser.xml.h:75
+#: data/browser.xml.h:75
 msgid "Sky"
 msgstr "Zerua"
 
-#: ../data/browser.xml.h:76
+#: data/browser.xml.h:76
 msgid "Sky Ridge"
 msgstr "Zeru-marrak"
 
-#: ../data/browser.xml.h:77
+#: data/browser.xml.h:77
 msgid "Snow Ridge"
 msgstr "Elur-marrak"
 
 #
-#. translators: this is the name of an emblem
-#: ../data/browser.xml.h:79
+#: data/browser.xml.h:78
 msgid "Sound"
 msgstr "Soinua"
 
-#: ../data/browser.xml.h:80
+#: data/browser.xml.h:79
 msgid "Special"
 msgstr "Berezia"
 
-#: ../data/browser.xml.h:81
+#: data/browser.xml.h:80
 msgid "Stucco"
 msgstr "Iztukadura"
 
-#: ../data/browser.xml.h:82
+#: data/browser.xml.h:81
 msgid "Tangerine"
 msgstr "Mandarina"
 
-#: ../data/browser.xml.h:83
+#: data/browser.xml.h:82
 msgid "Terracotta"
 msgstr "Terrakota"
 
-#: ../data/browser.xml.h:84
+#: data/browser.xml.h:83
 msgid "Urgent"
 msgstr "Presazkoa"
 
-#: ../data/browser.xml.h:85
+#: data/browser.xml.h:84
 msgid "Violet"
 msgstr "Bioleta"
 
-#: ../data/browser.xml.h:86
+#: data/browser.xml.h:85
 msgid "Wavy White"
 msgstr "Uhin-zuria"
 
-#: ../data/browser.xml.h:87
+#: data/browser.xml.h:86
 msgid "Web"
 msgstr "Web-a"
 
-#: ../data/browser.xml.h:88
+#: data/browser.xml.h:87
 msgid "White"
 msgstr "Zuria"
 
-#: ../data/browser.xml.h:89
+#: data/browser.xml.h:88
 msgid "White Ribs"
 msgstr "Uztai zuriak"
 
 #
-#: ../data/browser.xml.h:90
+#: data/browser.xml.h:89
 msgid "_Emblems"
 msgstr "_Ikurrak"
 
 #
-#: ../data/browser.xml.h:91
+#: data/browser.xml.h:90
 msgid "_Patterns"
 msgstr "_Ereduak"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:1
+#: data/favorites.desktop.in.h:1
+msgid "Favorite applications"
+msgstr "Gogoko aplikazioak"
+
+#: data/favorites.desktop.in.h:2
+msgid "Favorites"
+msgstr "Gogokoak"
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:1
+msgid "An Eggplant variation of the Crux theme."
+msgstr "Crux gaiaren Eggplant aldaera."
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:2
+msgid "Crux-Eggplant"
+msgstr "Crux Eggplant"
+
+#: icons/crux_teal/crux_teal.xml.h:1
+msgid "A Teal variation of the Crux theme."
+msgstr "Crux gaiaren Teal aldaera."
+
+#: icons/crux_teal/crux_teal.xml.h:2
+msgid "Crux-Teal"
+msgstr "Crux Teal"
+
+#: icons/default/default.xml.h:1
+msgid "Eazel"
+msgstr "Eazel"
+
+#: icons/default/default.xml.h:2
+msgid "This is the default theme for Nautilus."
+msgstr "Nautilus-en gai lehenetsia da hau."
+
+#: icons/gnome/gnome.xml.h:1
+msgid "A theme designed to fit well with the classic GNOME environment."
+msgstr "GNOMEren betiko inguruneari ondo egokitzeko moduko gaia."
+
+#: icons/sierra/sierra.xml.h:1
+msgid "Sierra"
+msgstr "Sierra"
+
+#: icons/sierra/sierra.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr "Manila karpetak eta atzeko plano gris-berdeak erabiltzen ditu."
+
+#: icons/tahoe/tahoe.xml.h:1
+msgid "Tahoe"
+msgstr "Tahoe"
+
+#: icons/tahoe/tahoe.xml.h:2
+msgid "This theme uses photo-realistic folders."
+msgstr "Argazki errealen karpetak erabiltzen ditu."
+
+#: libnautilus-extension/nautilus-column.c:175
+#: libnautilus-extension/nautilus-menu-item.c:206
+#: libnautilus-extension/nautilus-property-page.c:176
+#: libnautilus-private/nautilus-column-utilities.c:43
+#: src/file-manager/fm-list-view.c:1107
+msgid "Name"
+msgstr "Izena"
+
+#: libnautilus-extension/nautilus-column.c:176
+msgid "Name of the column"
+msgstr "Zutabearen izena"
+
+#: libnautilus-extension/nautilus-column.c:182
+msgid "Attribute"
+msgstr "Atributua"
+
+#: libnautilus-extension/nautilus-column.c:183
+msgid "The attribute name to display"
+msgstr "Atributuaren izena bistaratzeko"
+
+#: libnautilus-extension/nautilus-column.c:189
+#: libnautilus-extension/nautilus-menu-item.c:213
+#: libnautilus-extension/nautilus-property-page.c:183
+msgid "Label"
+msgstr "Etiketa"
+
+#: libnautilus-extension/nautilus-column.c:190
+msgid "Label to display in the column"
+msgstr "Etiketa zutabean erakusteko"
+
+#: libnautilus-extension/nautilus-column.c:196
+#: src/file-manager/fm-ditem-page.c:343 src/file-manager/fm-ditem-page.c:354
+msgid "Description"
+msgstr "Azalpena"
+
+#: libnautilus-extension/nautilus-column.c:197
+msgid "A user-visible description of the column"
+msgstr "Zutabeko erabiltzaile-ikusgaiaren azapena"
+
+#: libnautilus-extension/nautilus-column.c:204
+msgid "xalign"
+msgstr "xalign"
+
+#: libnautilus-extension/nautilus-column.c:205
+msgid "The x-alignment of the column"
+msgstr "Zutabearen x lerrokadura"
+
+#: libnautilus-extension/nautilus-menu-item.c:207
+msgid "Name of the item"
+msgstr "Elementuaren izena"
+
+#: libnautilus-extension/nautilus-menu-item.c:214
+msgid "Label to display to the user"
+msgstr "Etiketa erabiltzaileari bistaratzeko"
+
+#: libnautilus-extension/nautilus-menu-item.c:220
+msgid "Tip"
+msgstr "Aholkua"
+
+#: libnautilus-extension/nautilus-menu-item.c:221
+msgid "Tooltip for the menu item"
+msgstr "Eguneko aholkua, menuko elementuarena"
+
+#: libnautilus-extension/nautilus-menu-item.c:227
+msgid "Icon"
+msgstr "Ikonoa"
+
+#: libnautilus-extension/nautilus-menu-item.c:228
+msgid "Name of the icon to display in the menu item"
+msgstr "Ikonoaren izena, menuko elementuan bistaratzeko"
+
+#: libnautilus-extension/nautilus-menu-item.c:235
+msgid "Sensitive"
+msgstr "Sentsitiboa"
+
+#: libnautilus-extension/nautilus-menu-item.c:236
+msgid "Whether the menu item is sensitive"
+msgstr "Menuko elemenua sentsitiboa den edo ez"
+
+#: libnautilus-extension/nautilus-menu-item.c:242
+msgid "Priority"
+msgstr "Lehentasuna"
+
+#
+#: libnautilus-extension/nautilus-menu-item.c:243
+msgid "Show priority text in toolbars"
+msgstr "Erakutsi testuaren lehentasuna tresna-barran"
+
+#: libnautilus-extension/nautilus-property-page.c:177
+msgid "Name of the page"
+msgstr "Orriaren izena"
+
+#: libnautilus-extension/nautilus-property-page.c:184
+msgid "Label widget to display in the notebook tab"
+msgstr "Etikea widget-a ohar-koadernoko fitxan bistaratzeko"
+
+#
+#: libnautilus-extension/nautilus-property-page.c:190
+msgid "Page"
+msgstr "Orrialdea"
+
+#
+#: libnautilus-extension/nautilus-property-page.c:191
+msgid "Widget for the property page"
+msgstr "Widget-a orrialdearen propietatearena"
+
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:1
 msgid ""
 "A list of captions below an icon in the icon view and the desktop. The "
 "actual number of captions shown depends on the zoom level. Possible values "
@@ -403,19 +568,19 @@ msgstr ""
 "\"atzipen-data\", \"jabea\", \"taldea\", \"baimenak\", \"baimen_zortzitarrak"
 "\" eta \"mime_mota\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
-msgid "Always use the location entry, instead of the pathbar"
-msgstr "Erabili beti kokaleku-sarrera, bide-barra erabili ordez"
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
+msgid "Bring up a new window for every opened file"
+msgstr "Ireki beste leiho bat irekitako fitxategi bakoitzeko"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
 msgid "Computer icon visible on desktop"
 msgstr "Ordenagailuaren ikonoa ikusgai mahaigainean"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
 msgid "Criteria for search bar searching"
 msgstr "Bilaketa-barrarekin bilatzeko irizpideak"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid ""
 "Criteria when matching files searched for in the search bar. If set to "
 "\"search_by_text\", then Nautilus will Search for files by file name only. "
@@ -429,120 +594,122 @@ msgstr ""
 "fitxategiak fitxategi-izenaren eta fitxategi-propietateen arabera bilatuko "
 "ditu."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "Current Nautilus theme (deprecated)"
 msgstr "Uneko Nautilus-en gaia (zaharkitua)"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "Custom Background Set"
 msgstr "Atzeko plano pertsonalizatua"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
 msgid "Custom Side Pane Background Set"
 msgstr "Albo-paneleko atzeko plano pertsonalizatua"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
+#, fuzzy
 msgid "Date Format"
-msgstr "Data-formatua"
+msgstr "_Formatua"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Default Background Color"
 msgstr "Atzoko planoko kolore lehenetsia"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid "Default Background Filename"
 msgstr "Atzeko planoko fitxategi-izen lehenetsia"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
 msgid "Default Side Pane Background Color"
 msgstr "Albo-panelaren atzeko planoko kolore lehenetsia"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Default Side Pane Background Filename"
 msgstr "Albo-panelaren atzeko planoko fitxategi-izen lehenetsia"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
 msgid "Default column order in the list view"
 msgstr "Zutabearen orden lehenetsia, zerrenda-ikuspegian"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
 msgid "Default column order in the list view."
 msgstr "Zutabearen orden lehenetsia, zerrenda-ikuspegian."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
 msgid "Default folder viewer"
 msgstr "Karpeta-ikustaile lehenetsia"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
 msgid "Default icon zoom level"
 msgstr "Ikonoaren zoom-maila lehenetsia"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Default list of columns visible in the list view"
 msgstr "Zutabe-zerrenda lehenetsia zerrenda-ikuspegian ikusgai"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
 msgid "Default list of columns visible in the list view."
 msgstr "Zutabe-zerrenda lehenetsia zerrenda-ikuspegian ikusgai"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
 msgid "Default list zoom level"
 msgstr "Zerrendaren zoom-maila lehenetsia"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
 msgid "Default sort order"
 msgstr "Ordena lehenetsia"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
 msgid "Default zoom level used by the icon view."
 msgstr "Ikono-ikustaileak erabiltzen duen zoom-maila lehenetsia"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
 msgid "Default zoom level used by the list view."
 msgstr "Zerrenda-ikuspegiak erabiltzen duen zoom-maila lehenetsia"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid "Desktop computer icon name"
-msgstr "Mahaigaineko ordenagailu-ikonoaren  izena"
+msgstr "Mahaigaineko ikono nagusiaren izena"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid "Desktop font"
 msgstr "Mahaigaineko letra-tipoa"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid "Desktop home icon name"
 msgstr "Mahaigaineko ikono nagusiaren izena"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Desktop trash icon name"
 msgstr "Mahaigaineko zakarrontzi-ikonoaren izena"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 "Gaitu bandera 'bereziak' fitxategiaren hobespenen elkarrizketa-koadroan"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
 msgstr ""
 "Gaitu Nautilus klasikoaren portaera, non leiho guztiak arakatzaileak diren"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid ""
 "Filename for the default folder background. Only used if background_set is "
 "true."
@@ -550,7 +717,7 @@ msgstr ""
 "Direktorioaren atzeko plano lehenetsiaren fitxategi-izena. Atzeko_planoa "
 "egia denean bakarrik erabiltzen da."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -558,7 +725,7 @@ msgstr ""
 "Albo-panelaren atzeko plano lehenetsiaren fitxategi-izena. Albo-"
 "panelaren_atzeko planoa egia denean bakarrik erabiltzen da."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
 msgid ""
 "Folders over this size will be truncated to around this size. The purpose of "
 "this is to avoid unintentionally blowing the heap and killing Nautilus on "
@@ -570,11 +737,11 @@ msgstr ""
 "handietan ixtea saihestu nahi da. Balio negatiboak ez du mugarik adierazten. "
 "Muga gutxi gora-beherakoa da, direktorioak zatika irakurtzen direlako."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "Home icon visible on desktop"
 msgstr "Ikono nagusia ikusgai mahaigainean"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
@@ -583,36 +750,28 @@ msgstr ""
 "bakarrik erakutsiko ditu. Bestela, direktorioak eta fitxategiak biak "
 "erakutsiko ditu."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
 msgstr ""
 "Egia ezartzen bada, leiho ireki berriek helbide-barra ikusgai edukiko dute."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr ""
 "Egia ezartzen bada, leiho ireki berriek albo-panela ikusgai edukiko dute."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
 msgid "If set to true, newly opened windows will have the status bar visible."
 msgstr ""
 "Egia ezartzen bada, leiho ireki berriek egoera-barra ikusgai edukiko dute."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr ""
 "Egia ezartzen bada, leiho ireki berriek tresna-barra ikusgai edukiko dute."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
-msgid ""
-"If set to true, then Nautilus browser windows will always use a textual "
-"input entry for the location toolbar, instead of the pathbar."
-msgstr ""
-"Egia bada, Nautilus arakatzailearen leihoa testu-sarrera bezala erabiliko da helbidearen barran, "
-"bide-barra erabili ordez."
-
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid ""
 "If set to true, then Nautilus lets you edit some of the more esoteric "
 "options of a file in the file preferences dialog."
@@ -620,7 +779,7 @@ msgstr ""
 "Egia ezartzen bada, Nautilus-ek fitxategiaren balio handirik gabeko aukera "
 "batzuk editatzen utziko dizu fitxategiaren hobespenen elkarrizketa-koadroan."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
@@ -628,7 +787,7 @@ msgstr ""
 "Egia ezartzen bada, Nautilus-ek direktorioak erakusten ditu ikono- eta "
 "zerrenda-ikuspegian fitxategiak erakutsi aurretik."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "put files in the trash."
@@ -636,12 +795,20 @@ msgstr ""
 "Egia ezartzen bada, Nautilus-ek berrespena eskatuko du fitxategiak "
 "zakarrontzian jartzen saiatzen zarenean."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+msgid ""
+"If set to true, then Nautilus will bring up a new Nautilus window by default "
+"whenever an item is opened."
+msgstr ""
+"Egia ezartzen bada, Nautilus-ek Nautilus-en beste leiho bat irekiko du "
+"lehenespenez elementu bat irekitzen den bakoitzean."
+
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "Egia ezartzen bada, Nautilus-ek ikonoak mahaigainean marraztuko ditu."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
 "If set to true, then Nautilus will have a feature allowing you to delete a "
 "file immediately and in-place, instead of moving it to the trash. This "
@@ -651,7 +818,7 @@ msgstr ""
 "eta unean ezabatzeko aukera emango dizu zakarrontzira bota ordez. Funtzio "
 "hori arriskutsua izan daitezke, beraz, erabili arretaz."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 msgid ""
 "If set to true, then Nautilus will use the user's home folder as the "
 "desktop. If it is false, then it will use ~/Desktop as the desktop."
@@ -660,7 +827,7 @@ msgstr ""
 "mahaigain gisa erabiliko du. Faltsua bada, \"~/Desktop\" erabiliko du "
 "mahaigain gisa."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
 "If set to true, then all Nautilus windows will be browser windows. This is "
 "how Nautilus used to behave before version 2.6, and some people prefer this "
@@ -670,7 +837,7 @@ msgstr ""
 "dira. Hau Nautilus-en 2.6 bertsioa baino lehenagoko portaera izan da, "
 "erabiltzaile batzuk portaera hau atseginagoa dute."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
 "If set to true, then backup files such as those created by Emacs are "
 "displayed. Currently, only files ending in a tilde (~) are considered backup "
@@ -680,16 +847,16 @@ msgstr ""
 "bistaratuko dira. Unean, tildez (~) amaitzen diren fitxategiak bakarrik "
 "hartuko dira babeskopia-fitxategitzat."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
 "files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
-"Egia ezartzen bada, fitxategi ezkutuak fitxategi-kudeatzailean agertuko "
-"dira. Fitxategi ezkutuak puntua ('.') karakterearekin hasten diren "
-"fitxategiak dira edo direktorioaren .hidden fitxategien zerrendan daude."
+"Egia ezartzen bada, ezkutuko fitxategiak fitxategi-kudeatzailean agertuko "
+"dira. Ezkutuko fitxategiak dot fitxategiak dira edo direktorioaren .hidden "
+"fitxategien zerrendan daude."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
@@ -697,7 +864,7 @@ msgstr ""
 "Hemen egia ezartzen bada, ordenagailuaren helbidearekin estekatuta dagoen "
 "ikonoa mahaigainean agertuko da."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
@@ -705,7 +872,7 @@ msgstr ""
 "Hemen egia ezartzen bada, etxeko direktorioarekin estekatuta dagoen ikonoa "
 "mahaigainean agertuko da."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
@@ -713,15 +880,16 @@ msgstr ""
 "Hemen egia ezartzen bada, zakarrontziarekin estekatuta dagoen ikonoa "
 "mahaigainean agertuko da."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
+#, fuzzy
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
 msgstr ""
-"Hemen egia ezartzen bada, muntatutako bolumenekin estekatutako ikonoak "
-"mahaigainean agertuko dira."
+"Hemen egia ezartzen bada, zakarrontziarekin estekatuta dagoen ikonoa "
+"mahaigainean agertuko da."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid ""
 "If true, files in new windows will be sorted in reverse order. ie, if sorted "
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
@@ -731,7 +899,7 @@ msgstr ""
 "dira. Adibidez, izenaren arabera antolatuz gero, fitxategiak \"a\"-tik \"z\"-"
 "ra ordenatu beharrean \"z\"-tik \"a\"-ra ordenatuko dira."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
 "If true, files in new windows will be sorted in reverse order. ie, if sorted "
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
@@ -744,22 +912,22 @@ msgstr ""
 "ordenatuz gero, txikitik handira ordenatu beharrean handitik txikira "
 "ordenatuko dira."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Egia bada, ikonoak lehenespenez estuago aurkeztuko dira leiho berrietan."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid ""
 "If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "Egia bada, etiketak ikonoen ondoan ezarriko dira haien azpian ezarri ordez."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid "If true, new windows will use manual layout by default."
 msgstr "Egia bada, leiho berriek eskuzko diseinua erabiliko dute lehenespenez."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid ""
 "Images over this size (in bytes) won't be thumbnailed. The purpose of this "
 "setting is to avoid thumbnailing large images that may take a long time to "
@@ -769,19 +937,19 @@ msgstr ""
 "sartuko. Ezarpen horren helburua hauxe da: kargatzen luzaro irauten duten "
 "edo memoria asko erabiltzen duten irudi handiak koadro txikian sartzea."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 msgid "List of possible captions on icons"
 msgstr "Ikonoetako epigrafe posibleen zerrenda"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid "Maximum handled files in a folder"
 msgstr "Direktorio batean maneiatutako fitxategien gehienezko kopurua"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid "Maximum image size for thumbnailing"
 msgstr "Koadro txikian sartzeko irudiaren gehienezko tamaina"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
@@ -790,21 +958,21 @@ msgstr ""
 "zaharkituta geratu da da. Horren ordez, erabili ikono-gaia."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus-ek mahaigaineko marrazkia kudeatzen du"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 "Nautilus-ek erabiltzaileen etxeko direktorioa mahaigain gisa erabiltzen du"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Only show folders in the tree sidebar"
 msgstr "Direktorioak zuhaitzaren alboko barran bakarrik erakutsi"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
@@ -812,62 +980,61 @@ msgstr ""
 "Balio posibleak \"bakarra\" eta \"bikoitza\" dira, fitxategiak klik bakarrez "
 "edo klik bikoitzez abiarazteko, hurrenez hurren."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
 msgid "Put labels beside icons"
 msgstr "Jarri etiketak ikonoen ondoan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
 msgid "Reverse sort order in new windows"
 msgstr "Alderantzikatu leiho berrien ordena"
 
-#. Translators: please note this can choose the size. e.g.
-#. "Sans 15". Please do not change "Sans", only change the size if you need to. In
-#. most cases, this should be left alone.
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#. Translators: please note this can choose the default font and the size. e.g. "Monospace 8". Please do not translate "Sans". In most cases, this should be left alone.
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 msgid "Sans 10"
-msgstr "Sans 10"
+msgstr ""
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "Show folders first in windows"
 msgstr "Erakutsi direktorioak lehenik leihoetan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid "Show location bar in new windows"
 msgstr "Erakutsi helbide-barra leiho berrietan"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid "Show mounted volumes on the desktop"
-msgstr "Erakutsi muntatutako bolumenak mahaigainean"
+msgstr "Zakarrontzia mahaigainean eduki behar da."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid "Show side pane in new windows"
 msgstr "Erakutsi albo-panela leiho berrietan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "Show status bar in new windows"
 msgstr "Bistaratu egoera-barra leiho berrietan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "Show toolbar in new windows"
 msgstr "Erakutsi tresna-barra leiho berrietan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid "Side pane view"
 msgstr "Albo-panelaren ikuspegia"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
 "Speed tradeoff for when to preview a sound file when mousing over a files "
 "icon. If set to \"always\" then always plays the sound, even if the file is "
 "on a remote server. If set to \"local_only\" then only plays previews on "
-"local file systems. If set to \"never\" then it never previews sound."
+"local filesystems. If set to \"never\" then it never previews sound."
 msgstr ""
 "Saguarekin fitxategien ikonoaren gainetik pasatzean soinu-fitxategia "
 "aurreikusi behar denerako abiadura-erlazioa. \"beti\" ezartzen bada, soinua "
@@ -875,12 +1042,12 @@ msgstr ""
 "\"lokalak_bakarrik\" ezarriz gero, aurrebistak fitxategi-sistema lokaletan "
 "bakarrik egingo dira. \"Inoiz_ez\" ezarriz gero, ez du soinua inoiz joko."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid ""
 "Speed tradeoff for when to show a preview of text file contents in the "
 "file's icon. If set to \"always\" then always show previews, even if the "
 "folder is on a remote server. If set to \"local_only\" then only show "
-"previews for local file systems. If set to \"never\" then never bother to "
+"previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
 "Abiadura-erlazioa fitxategi-ikonoko testu-fitxategiko edukien aurrebista "
@@ -890,13 +1057,13 @@ msgstr ""
 "bakarrik erakusten da. \"inoiz_ez\" ezartzen bada, ez dituzu inoiz "
 "aurrebista-datuak irakurriko."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
 "\"always\" then always thumbnail, even if the folder is on a remote server. "
-"If set to \"local_only\" then only show thumbnails for local file systems. "
-"If set to \"never\" then never bother to thumbnail images, just use a "
-"generic icon."
+"If set to \"local_only\" then only show thumbnails for local filesystems. If "
+"set to \"never\" then never bother to thumbnail images, just use a generic "
+"icon."
 msgstr ""
 "Abiadura-erlazioa irudi-fitxategi bat koadro txiki moduan erakutsi behar "
 "denerako. \"beti\" ezartzen bada, beti sartuko da koadro txikian, baita "
@@ -905,12 +1072,12 @@ msgstr ""
 "\"inoiz_ez\" ezarriz gero, ez ditu inoiz irudiak koadro txikian sartuko, "
 "erabili ikono generiko bat."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
 msgid ""
 "Speed tradeoff for when to show the number of items in a folder. If set to "
 "\"always\" then always show item counts, even if the folder is on a remote "
-"server. If set to \"local_only\" then only show counts for local file "
-"systems. If set to \"never\" then never bother to compute item counts."
+"server. If set to \"local_only\" then only show counts for local "
+"filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Abiadura-erlazioa direktorioko elementu kopurua erakutsi behar denerako. "
 "\"beti\" ezartzen bada, beti erakutsiko da elementu-kopurua, baita "
@@ -918,7 +1085,7 @@ msgstr ""
 "ezartzen bada, fitxategi-sistema lokaletakoak bakarrik kontatzen ditu. "
 "\"inoiz_ez\" ezartzen bada, ez ditu inoiz elementuak kontatuko."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
@@ -926,7 +1093,7 @@ msgstr ""
 "Ikono-ikuspegiko elementuen ordena lehenetsia. Balio posibleak hauek dira: "
 "\"izena\", \"tamaina\", \"mota\", \"aldatze_data\", \"ikurrak\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
 msgid ""
 "The default sort-order for the items in the list view. Possible values are "
 "\"name\", \"size\", \"type\", and \"modification_date\"."
@@ -935,38 +1102,40 @@ msgstr ""
 "dira: izena, tamaina, mota eta aldatze-data."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 msgid "The default width of the side pane in new windows."
 msgstr "Albo-panelaren zabalera lehenetsia leiho berrietan."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "The font description used for the icons on the desktop."
 msgstr "Mahaigaineko ikonoetan erabiltzen den letra-tipoaren azalpena."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
+#, fuzzy
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
 msgstr ""
-"Data-fitxategien formatua. Balio posibleak hauek dira: \"locale\", \"iso\", "
-"eta \"informal\"."
+"Zerrenda-ikuspegiko elementuaren ordena lehenetsia. Balio posibleak hauek "
+"dira: izena, tamaina, mota eta aldatze-data."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid "The side pane view to show in newly opened windows."
 msgstr "Leiho ireki berrietan erakusteko albo-panelaren ikuspegia."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
+#, fuzzy
 msgid ""
 "This name can be set if you want a custom name for the computer icon on the "
 "desktop."
 msgstr ""
-"Izen hori ezar dezakezu, mahaigaineko ordenagailu-ikonoak izen "
-"pertsonalizatua edukitzea nahi baduzu."
+"Izen hori ezar dezakezu, mahaigaineko ikono nagusiarentzat izen "
+"pertsonalizatua nahi baduzu."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
@@ -975,7 +1144,7 @@ msgstr ""
 "pertsonalizatua nahi baduzu."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
@@ -983,30 +1152,30 @@ msgstr ""
 "Izen hori ezar dezakezu, mahaigaineko zakarrontzi-ikonoarentzat izen "
 "pertsonalizatua nahi baduzu."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 msgid "Trash icon visible on desktop"
 msgstr "Zakarrontzi-ikonoa ikusgai mahaigainean"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Type of click used to launch/open files"
 msgstr "Fitxategiak abiarazteko/irekitzeko erabiliko den klik mota"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Use manual layout in new windows"
 msgstr "Erabili eskuzko diseinua leiho berrietan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid "Use tighter layout in new windows"
 msgstr "Erabili diseinu estuagoa leiho berrietan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
 msgid "What to do with executable text files when activated"
 msgstr "Zer egin testu-fitxategi exekutagarriekin aktibatutakoan"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
 msgid ""
 "What to do with executable text files when they are activated (single or "
 "double clicked). Possible values are \"launch\" to launch them as programs, "
@@ -1018,7 +1187,7 @@ msgstr ""
 "abiarazteko, \"galdetu\" zer egin galdetzeko elkarrizketa-koadro baten "
 "bidez, eta \"bistaratu\" testu-fitxategi gisa bistaratzeko."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
 msgid ""
 "When a folder is visited this viewer is used unless you have selected "
 "another view for that particular folder. Possible values are \"list_view\" "
@@ -1029,271 +1198,283 @@ msgstr ""
 "\"zerrenda_ikuspegia\" eta \"ikono-ikuspegia\"."
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
 msgid "When to show number of items in a folder"
 msgstr "Noiz erakutsi direktorioko elementu-kopurua"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:101
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
 msgid "When to show preview text in icons"
 msgstr "Noiz erakutsi testuaren aurrebista ikonoetan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:102
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
 msgid "When to show thumbnails of image files"
 msgstr "Noiz erakutsi irudi-fitxategiak koadro txikietan"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:103
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:101
 msgid "Whether a custom default folder background has been set."
 msgstr ""
-"Direktorioaren atzeko plano lehenetsi pertsonalizatua ezarri den edo ez"
+"Direktorioaren atzeko plano lehenetsi pertsonalizatua ezarri den ala ez "
+"adierazten du."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:102
 msgid "Whether a custom default side pane background has been set."
-msgstr "Albo-panelean atzeko plano lehenetsi pertsonalizatua ezarri den edo ez"
+msgstr ""
+"Albo-panelean atzeko plano lehenetsi pertsonalizatua ezarri den ala ez "
+"adierazten du."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:105
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:103
 msgid "Whether to ask for confirmation when moving files to trash"
-msgstr "Fitxategiak zakarrontzira botatzean berrespena eskatuko den edo ez"
+msgstr ""
+"Fitxategiak zakarrontzira botatzean berrespena eskatuko den ala ez "
+"adierazten du"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
 msgid "Whether to enable immediate deletion"
-msgstr "Berehalako ezabatzea gaituko den edo ez"
+msgstr "Berehalako ezabatzea gaituko den ala ez adierazten du"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:105
 msgid "Whether to preview sounds when mousing over an icon"
-msgstr "Ikono gainetik sagua pasatzean soinuak aurreikusiko diren edo ez"
+msgstr ""
+"Ikono gainetik sagua pasatzean soinuak aurreikusiko diren ala ez adierazten "
+"du"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
 msgid "Whether to show backup files"
-msgstr "Babeskopia-fitxategiak erakutsiko diren edo ez"
+msgstr "Babeskopia-fitxategiak erakutsiko diren ala ez adierazten du"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
 msgid "Whether to show hidden files"
-msgstr "Fitxategi ezkutuak erakutsiko diren edo ez"
+msgstr "Fitxategi ezkutuak erakutsiko diren ala ez adierazten du"
 
 #
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
 msgid "Width of the side pane"
 msgstr "Albo-panelaren zabalera"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:386
+msgid "Cut _Text"
+msgstr "Ebaki _testua"
+
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:442
+#: libnautilus-private/nautilus-clipboard.c:387
 msgid "Cut the selected text to the clipboard"
 msgstr "Hautatutako testua ebaki eta arbelera eramaten du"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:390
+msgid "_Copy Text"
+msgstr "_Kopiatu testua"
+
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:446
+#: libnautilus-private/nautilus-clipboard.c:391
 msgid "Copy the selected text to the clipboard"
 msgstr "Hautatutako testua arbelean kopiatzen du"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:394
+msgid "_Paste Text"
+msgstr "_Itsatsi testua"
+
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:450
+#: libnautilus-private/nautilus-clipboard.c:395
 msgid "Paste the text stored on the clipboard"
 msgstr "Arbelean gordetako testua itsasten du"
 
 #. name, stock id
-#: ../libnautilus-private/nautilus-clipboard.c:453
-#: ../src/file-manager/fm-directory-view.c:6176
+#: libnautilus-private/nautilus-clipboard.c:398
 msgid "Select _All"
 msgstr "Hautatu _dena"
 
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:454
+#: libnautilus-private/nautilus-clipboard.c:399
 msgid "Select all the text in a text field"
 msgstr "Testu-eremuko testu osoa hautatzen du"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:394
+#: libnautilus-private/nautilus-column-chooser.c:394
 msgid "Move _Up"
-msgstr "Eraman g_ora"
+msgstr "Mugitu g_ora"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:404
-msgid "Move Dow_n"
-msgstr "Eraman _behera"
+#: libnautilus-private/nautilus-column-chooser.c:404
+msgid "Move _Down"
+msgstr "Mugitu _behera"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:413
+#: libnautilus-private/nautilus-column-chooser.c:413
 msgid "_Show"
 msgstr "Era_kutsi"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:423
-msgid "Hi_de"
+#: libnautilus-private/nautilus-column-chooser.c:423
+msgid "_Hide"
 msgstr "E_zkutatu"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:436
-msgid "Use De_fault"
+#: libnautilus-private/nautilus-column-chooser.c:436
+msgid "_Use Default"
 msgstr "_Erabili lehenetsia"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:43
-#: ../src/file-manager/fm-list-view.c:1421
-msgid "Name"
-msgstr "Izena"
-
-#: ../libnautilus-private/nautilus-column-utilities.c:44
+#: libnautilus-private/nautilus-column-utilities.c:44
 msgid "The name and icon of the file."
 msgstr "Fitxategiaren izena eta ikonoa"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:50
+#: libnautilus-private/nautilus-column-utilities.c:50
 msgid "Size"
 msgstr "Tamaina"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:51
+#: libnautilus-private/nautilus-column-utilities.c:51
 msgid "The size of the file."
 msgstr "Fitxategiaren tamaina"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:58
+#: libnautilus-private/nautilus-column-utilities.c:58
 msgid "Type"
 msgstr "Mota"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:59
+#: libnautilus-private/nautilus-column-utilities.c:59
 msgid "The type of the file."
 msgstr "Fitxategi mota"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:65
+#: libnautilus-private/nautilus-column-utilities.c:65
 msgid "Date Modified"
 msgstr "Aldatze-data"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:66
+#: libnautilus-private/nautilus-column-utilities.c:66
 msgid "The date the file was modified."
 msgstr "Fitxategia aldatu zeneko data"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:73
+#: libnautilus-private/nautilus-column-utilities.c:73
 msgid "Date Accessed"
 msgstr "Atzipen-data"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:74
+#: libnautilus-private/nautilus-column-utilities.c:74
 msgid "The date the file was accessed."
 msgstr "Fitxategia atzitu zeneko data"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:81
+#: libnautilus-private/nautilus-column-utilities.c:81
 msgid "Owner"
 msgstr "Jabea"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:82
+#: libnautilus-private/nautilus-column-utilities.c:82
 msgid "The owner of the file."
 msgstr "Fitxategiaren jabea"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:89
+#: libnautilus-private/nautilus-column-utilities.c:89
 msgid "Group"
 msgstr "Taldea"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:90
+#: libnautilus-private/nautilus-column-utilities.c:90
 msgid "The group of the file."
 msgstr "Fitxategiaren taldea"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:97
-#: ../src/file-manager/fm-properties-window.c:2992
+#: libnautilus-private/nautilus-column-utilities.c:97
+#: src/file-manager/fm-properties-window.c:2942
 msgid "Permissions"
 msgstr "Baimenak"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:98
+#: libnautilus-private/nautilus-column-utilities.c:98
 msgid "The permissions of the file."
 msgstr "Fitxategiaren baimenak"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:105
+#: libnautilus-private/nautilus-column-utilities.c:105
 msgid "Octal Permissions"
 msgstr "Baimen zortzitarrak"
 
 #
-#: ../libnautilus-private/nautilus-column-utilities.c:106
+#: libnautilus-private/nautilus-column-utilities.c:106
 msgid "The permissions of the file, in octal notation."
 msgstr "FItxategiaren baimenak, zenbaki zortzitar eran"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:113
+#: libnautilus-private/nautilus-column-utilities.c:113
 msgid "MIME Type"
 msgstr "MIME mota"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:114
+#: libnautilus-private/nautilus-column-utilities.c:114
 msgid "The mime type of the file."
 msgstr "Fitxategiaren mime mota"
 
-#: ../libnautilus-private/nautilus-customization-data.c:404
-msgid "Reset"
+#: libnautilus-private/nautilus-customization-data.c:406
+msgid "reset"
 msgstr "berrezarri"
 
-#: ../libnautilus-private/nautilus-desktop-directory-file.c:442
-#: ../libnautilus-private/nautilus-desktop-icon-file.c:163
-#: ../libnautilus-private/nautilus-trash-file.c:690
+#: libnautilus-private/nautilus-desktop-directory-file.c:442
+#: libnautilus-private/nautilus-desktop-icon-file.c:163
+#: libnautilus-private/nautilus-trash-file.c:690
 msgid "on the desktop"
 msgstr "mahaigainean"
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:114
-#, c-format
-msgid "You cannot move the volume \"%s\" to the trash."
-msgstr "Ezin duzu \"%s\"  bolumena zakarrontzira bota."
+#
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Ezin da bolumen-ikonoa ezabatu."
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:124
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"If you want to eject the volume, please use Eject in the right-click menu of "
 "the volume."
 msgstr ""
-"Bolumena egoztea nahi baduzu, erabili \"Egotzi\" bolumenaren laster-menuan."
+"Bolumena egoztea nahi baduzu, erabili 'Egotzi' bolumenaren menuaren "
+"eskuinean klik eginda."
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:133
-msgid ""
-"If you want to unmount the volume, please use \"Unmount Volume\" in the "
-"popup menu of the volume."
-msgstr ""
-"Bolumena desmuntatzea nahi baduzu, erabili \"Desmuntatu bolumena\" bolumenaren laster-menuan."
+#
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
+msgstr "Ezin da bolumena ezabatu"
 
 #
-#: ../libnautilus-private/nautilus-dnd.c:640
+#: libnautilus-private/nautilus-dnd.c:631
 msgid "_Move here"
 msgstr "_Eraman hona"
 
 #
-#: ../libnautilus-private/nautilus-dnd.c:645
+#: libnautilus-private/nautilus-dnd.c:636
 msgid "_Copy here"
 msgstr "_Kopiatu hemen"
 
 #
-#: ../libnautilus-private/nautilus-dnd.c:650
+#: libnautilus-private/nautilus-dnd.c:641
 msgid "_Link here"
 msgstr "_Estekatu honi"
 
 #
-#: ../libnautilus-private/nautilus-dnd.c:655
+#: libnautilus-private/nautilus-dnd.c:646
 msgid "Set as _Background"
 msgstr "Ezarri _atzeko plano gisa"
 
-#: ../libnautilus-private/nautilus-dnd.c:664
-#: ../libnautilus-private/nautilus-dnd.c:719
+#: libnautilus-private/nautilus-dnd.c:655
+#: libnautilus-private/nautilus-dnd.c:710
 msgid "Cancel"
 msgstr "Utzi"
 
 #
-#: ../libnautilus-private/nautilus-dnd.c:705
+#: libnautilus-private/nautilus-dnd.c:696
 msgid "Set as background for _all folders"
 msgstr "Ezarri karpeta _guztien atzeko plano gisa"
 
 #
-#: ../libnautilus-private/nautilus-dnd.c:710
+#: libnautilus-private/nautilus-dnd.c:701
 msgid "Set as background for _this folder"
 msgstr "Ezarri karpeta _honen atzeko plano gisa"
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:197
-#: ../libnautilus-private/nautilus-emblem-utils.c:202
-#: ../libnautilus-private/nautilus-emblem-utils.c:257
-#: ../libnautilus-private/nautilus-emblem-utils.c:275
+#: libnautilus-private/nautilus-emblem-utils.c:197
+#: libnautilus-private/nautilus-emblem-utils.c:202
+#: libnautilus-private/nautilus-emblem-utils.c:257
+#: libnautilus-private/nautilus-emblem-utils.c:274
 msgid "The emblem cannot be installed."
 msgstr "Ikurra ezin izan da instalatu."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:198
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Ikur berriarentzat gako-hitz bat zehaztu behar duzu."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:199
-#: ../libnautilus-private/nautilus-emblem-utils.c:204
-#: ../libnautilus-private/nautilus-emblem-utils.c:259
-#: ../libnautilus-private/nautilus-emblem-utils.c:277
+#: libnautilus-private/nautilus-emblem-utils.c:199
+#: libnautilus-private/nautilus-emblem-utils.c:204
+#: libnautilus-private/nautilus-emblem-utils.c:259
+#: libnautilus-private/nautilus-emblem-utils.c:276
 msgid "Couldn't Install Emblem"
 msgstr "Ezin da ikurra instalatu"
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:203
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1303,79 +1484,71 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: ../libnautilus-private/nautilus-emblem-utils.c:213
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
 msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "Lehendik badago \"%s\" izeneko ikurra."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:214
+#: libnautilus-private/nautilus-emblem-utils.c:214
 msgid "Please choose a different emblem name."
 msgstr "Aukeratu beste izen bat."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:215
+#: libnautilus-private/nautilus-emblem-utils.c:215
 msgid "Couldn't install emblem"
 msgstr "Ezin da ikurra instalatu"
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:258
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Ezin izan da ikur pertsonalizatua gorde."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:276
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Ezin izan da ikur pertsonalizatuaren izena gorde."
 
-#: ../libnautilus-private/nautilus-file-operations-progress.c:169
-#, c-format
-msgid "%s %ld of %ld %s"
-msgstr "%s %ld / %ld %s"
-
-#: ../libnautilus-private/nautilus-file-operations-progress.c:448
+#: libnautilus-private/nautilus-file-operations-progress.c:402
 #, c-format
 msgid "(%d:%02d:%d Remaining)"
-msgstr "(%d:%02d:%d falta da)"
+msgstr ""
 
-#: ../libnautilus-private/nautilus-file-operations-progress.c:453
+#: libnautilus-private/nautilus-file-operations-progress.c:407
 #, c-format
 msgid "(%d:%02d Remaining)"
-msgstr "(%d:%02d falta da)"
+msgstr ""
 
-#: ../libnautilus-private/nautilus-file-operations.c:362
-#: ../libnautilus-private/nautilus-file-operations.c:387
-#: ../libnautilus-private/nautilus-file-utilities.c:70
-#: ../src/nautilus-connect-server-dialog.c:287
+#: libnautilus-private/nautilus-file-operations-progress.c:520
 #, c-format
-msgid "%s on %s"
-msgstr "%s - %s"
+msgid "%ld of %ld"
+msgstr "%ld / %ld"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: ../libnautilus-private/nautilus-file-operations.c:371
+#: libnautilus-private/nautilus-file-operations.c:358
 msgid "From:"
 msgstr "Nondik:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: ../libnautilus-private/nautilus-file-operations.c:394
+#: libnautilus-private/nautilus-file-operations.c:373
 msgid "To:"
 msgstr "Nora:"
 
-#: ../libnautilus-private/nautilus-file-operations.c:580
-#: ../libnautilus-private/nautilus-file-operations.c:628
-#: ../libnautilus-private/nautilus-file-operations.c:633
-#: ../libnautilus-private/nautilus-file-operations.c:643
+#: libnautilus-private/nautilus-file-operations.c:559
+#: libnautilus-private/nautilus-file-operations.c:607
+#: libnautilus-private/nautilus-file-operations.c:612
+#: libnautilus-private/nautilus-file-operations.c:622
 msgid "Error while moving."
 msgstr "Errorea lekuz aldatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:581
+#: libnautilus-private/nautilus-file-operations.c:560
 #, c-format
 msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "ezin da \"%s\" lekuz aldatu, irakurtzeko soilik den disko batean dagoelako."
 
-#: ../libnautilus-private/nautilus-file-operations.c:591
-#: ../libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:570
+#: libnautilus-private/nautilus-file-operations.c:576
 msgid "Error while deleting."
 msgstr "Errorea ezabatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:592
+#: libnautilus-private/nautilus-file-operations.c:571
 #, c-format
 msgid ""
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
@@ -1384,12 +1557,12 @@ msgstr ""
 "ezin da \"%s\" ezabatu karpeta gurasoan aldaketak egiteko baimenik ez "
 "duzulako."
 
-#: ../libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:577
 #, c-format
 msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr "ezin da \"%s\" ezabatu irakurtzeko soilik den disko batean dagoelako."
 
-#: ../libnautilus-private/nautilus-file-operations.c:629
+#: libnautilus-private/nautilus-file-operations.c:608
 #, c-format
 msgid ""
 "\"%s\" cannot be moved because you do not have permissions to change it or "
@@ -1398,7 +1571,7 @@ msgstr ""
 "ezin da \"%s\" lekuz aldatu, bera edo bere karpeta gurasoa aldatzeko "
 "baimenik ez duzulako."
 
-#: ../libnautilus-private/nautilus-file-operations.c:634
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
 "Cannot move \"%s\" because it or its parent folder are contained in the "
@@ -1407,7 +1580,7 @@ msgstr ""
 "\"%s\" ezin da lekuz aldatu, bera edo haren karpeta gurasoa helburuan "
 "sartuta daudelako."
 
-#: ../libnautilus-private/nautilus-file-operations.c:644
+#: libnautilus-private/nautilus-file-operations.c:623
 #, c-format
 msgid ""
 "Cannot move \"%s\" to the trash because you do not have permissions to "
@@ -1416,146 +1589,146 @@ msgstr ""
 "ezin da \"%s\" zakarrontzira eraman, bera edo haren karpeta gurasoa "
 "aldatzeko baimenik ez duzulako."
 
-#: ../libnautilus-private/nautilus-file-operations.c:666
+#: libnautilus-private/nautilus-file-operations.c:645
 msgid "Error while copying."
 msgstr "Errorea kopiatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:667
+#: libnautilus-private/nautilus-file-operations.c:646
 #, c-format
 msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr "ezin da \"%s\" kopiatu, irakurtzeko baimenik ez duzulako."
 
-#: ../libnautilus-private/nautilus-file-operations.c:687
-#: ../libnautilus-private/nautilus-file-operations.c:708
-#: ../libnautilus-private/nautilus-file-operations.c:712
+#: libnautilus-private/nautilus-file-operations.c:666
+#: libnautilus-private/nautilus-file-operations.c:687
+#: libnautilus-private/nautilus-file-operations.c:691
 #, c-format
 msgid "Error while copying to \"%s\"."
 msgstr "Errorea kopiatzean \"%s\"-ra."
 
-#: ../libnautilus-private/nautilus-file-operations.c:688
-#: ../libnautilus-private/nautilus-file-operations.c:693
-#: ../libnautilus-private/nautilus-file-operations.c:697
+#: libnautilus-private/nautilus-file-operations.c:667
+#: libnautilus-private/nautilus-file-operations.c:672
+#: libnautilus-private/nautilus-file-operations.c:676
 msgid "There is not enough space on the destination."
 msgstr "Ez dago nahikoa leku helburuan."
 
-#: ../libnautilus-private/nautilus-file-operations.c:692
+#: libnautilus-private/nautilus-file-operations.c:671
 #, c-format
 msgid "Error while moving to \"%s\"."
 msgstr "Errorea \"%s\"-ra lekuz aldatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:696
+#: libnautilus-private/nautilus-file-operations.c:675
 #, c-format
 msgid "Error while creating link in \"%s\"."
 msgstr "Errorea \"%s\"-(e)n esteka sortzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:709
-#: ../libnautilus-private/nautilus-file-operations.c:720
-#: ../libnautilus-private/nautilus-file-operations.c:731
+#: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:710
 msgid "You do not have permissions to write to this folder."
 msgstr "Ez duzu karpeta horretan idazteko baimenik."
 
-#: ../libnautilus-private/nautilus-file-operations.c:713
-#: ../libnautilus-private/nautilus-file-operations.c:724
-#: ../libnautilus-private/nautilus-file-operations.c:735
+#: libnautilus-private/nautilus-file-operations.c:692
+#: libnautilus-private/nautilus-file-operations.c:703
+#: libnautilus-private/nautilus-file-operations.c:714
 msgid "The destination disk is read-only."
 msgstr "Helburuko diskoa irakurtzeko soilik da."
 
-#: ../libnautilus-private/nautilus-file-operations.c:719
-#: ../libnautilus-private/nautilus-file-operations.c:723
+#: libnautilus-private/nautilus-file-operations.c:698
+#: libnautilus-private/nautilus-file-operations.c:702
 #, c-format
 msgid "Error while moving items to \"%s\"."
 msgstr "Errorea \"%s\"-(e)ra lekuz aldatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:730
-#: ../libnautilus-private/nautilus-file-operations.c:734
+#: libnautilus-private/nautilus-file-operations.c:709
+#: libnautilus-private/nautilus-file-operations.c:713
 #, c-format
 msgid "Error while creating links in \"%s\"."
 msgstr "Errorea \"%s\"-(e)n esteka sortzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:762
+#: libnautilus-private/nautilus-file-operations.c:741
 #, c-format
 msgid "Error \"%s\" while copying \"%s\"."
 msgstr "\"%s\" errorea \"%s\" kopiatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:763
-#: ../libnautilus-private/nautilus-file-operations.c:767
-#: ../libnautilus-private/nautilus-file-operations.c:771
-#: ../libnautilus-private/nautilus-file-operations.c:777
-#: ../libnautilus-private/nautilus-file-operations.c:792
-#: ../libnautilus-private/nautilus-file-operations.c:796
-#: ../libnautilus-private/nautilus-file-operations.c:800
-#: ../libnautilus-private/nautilus-file-operations.c:806
+#: libnautilus-private/nautilus-file-operations.c:742
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:750
+#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:771
+#: libnautilus-private/nautilus-file-operations.c:775
+#: libnautilus-private/nautilus-file-operations.c:779
+#: libnautilus-private/nautilus-file-operations.c:785
 msgid "Would you like to continue?"
 msgstr "Jarraitu nahi duzu?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:766
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
 msgid "Error \"%s\" while moving \"%s\"."
 msgstr "\"%s\" errorea \"%s\" lekuz aldatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:749
 #, c-format
 msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr "\"%s\" errorea \"%s\"ri esteka sortzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:776
+#: libnautilus-private/nautilus-file-operations.c:755
 #, c-format
 msgid "Error \"%s\" while deleting \"%s\"."
 msgstr "\"%s\" errorea \"%s\" ezabatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:791
+#: libnautilus-private/nautilus-file-operations.c:770
 #, c-format
 msgid "Error \"%s\" while copying."
 msgstr "\"%s\" errorea kopiatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:795
+#: libnautilus-private/nautilus-file-operations.c:774
 #, c-format
 msgid "Error \"%s\" while moving."
 msgstr "\"%s\" errorea lekuz aldatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:799
+#: libnautilus-private/nautilus-file-operations.c:778
 #, c-format
 msgid "Error \"%s\" while linking."
 msgstr "\"%s\" errorea esteka sortzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:805
+#: libnautilus-private/nautilus-file-operations.c:784
 #, c-format
 msgid "Error \"%s\" while deleting."
 msgstr "\"%s\" errorea ezabatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:931
+#: libnautilus-private/nautilus-file-operations.c:910
 msgid "Error While Copying"
 msgstr "Errorea kopiatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:934
+#: libnautilus-private/nautilus-file-operations.c:913
 msgid "Error While Moving"
 msgstr "Errorea lekuz aldatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:937
+#: libnautilus-private/nautilus-file-operations.c:916
 msgid "Error While Linking"
 msgstr "Errorea esteka sortzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:942
+#: libnautilus-private/nautilus-file-operations.c:921
 msgid "Error While Deleting"
 msgstr "Errorea ezabatzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:961
-#: ../libnautilus-private/nautilus-file-operations.c:979
-msgid "_Retry"
-msgstr "_Saiatu berriro"
-
-#: ../libnautilus-private/nautilus-file-operations.c:979
-#: ../libnautilus-private/nautilus-file-operations.c:1128
-#: ../libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:948
+#: libnautilus-private/nautilus-file-operations.c:969
+#: libnautilus-private/nautilus-file-operations.c:1118
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "_Skip"
 msgstr "_Saltatu"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:969
+msgid "_Retry"
+msgstr "_Saiatu berriro"
+
+#: libnautilus-private/nautilus-file-operations.c:1059
 #, c-format
 msgid "Could not move \"%s\" to the new location."
 msgstr "Ezin izan da \"%s\" helbide berrira aldatu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1072
+#: libnautilus-private/nautilus-file-operations.c:1062
 msgid ""
 "The name is already used for a special item that cannot be removed or "
 "replaced.  If you still want to move the item, rename it and try again."
@@ -1563,12 +1736,12 @@ msgstr ""
 "Izena jadanik ezabatu edo ordeztu ezin daitekeen elementu berezi batek "
 "darabil. Hala ere lekuz aldatu nahi baduzu, aldatu izena eta saiatu berriro."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1076
+#: libnautilus-private/nautilus-file-operations.c:1066
 #, c-format
 msgid "Could not copy \"%s\" to the new location."
 msgstr "Ezin izan da \"%s\" helbide berrian kopiatu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1079
+#: libnautilus-private/nautilus-file-operations.c:1069
 msgid ""
 "The name is already used for a special item that cannot be removed or "
 "replaced.  If you still want to copy the item, rename it and try again."
@@ -1576,43 +1749,42 @@ msgstr ""
 "Izena jadanik ezabatu edo ordeztu ezin daitekeen elementu berezi batek "
 "darabil. Hala ere kopiatu nahi baduzu, aldatu izena eta saiatu berriro."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1085
+#: libnautilus-private/nautilus-file-operations.c:1075
 msgid "Unable to Replace File"
 msgstr "Ezin da fitxategia ordeztu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1101
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1091
+#, fuzzy, c-format
 msgid "The folder \"%s\" already exists.  Would you like to replace it?"
-msgstr "\"%s\" karpeta badago lehendik. Ordeztu nahi duzu?"
+msgstr "\"%s\" fitxategia lehendik existitzen da. Ordeztu nahi duzu?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1104
+#: libnautilus-private/nautilus-file-operations.c:1094
 #, c-format
 msgid "The file \"%s\" already exists.  Would you like to replace it?"
-msgstr "\"%s\" fitxategia badago lehendik. Ordeztu nahi duzu?"
+msgstr "\"%s\" fitxategia lehendik existitzen da. Ordeztu nahi duzu?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1112
+#: libnautilus-private/nautilus-file-operations.c:1102
+#, fuzzy
 msgid ""
 "If you replace the existing folder, any files in it that conflict with the "
 "files being copied will be overwritten."
-msgstr ""
-"Dagoen karpeta bat ordezten baduzu, kopiatuko diren fitxategiekin gatazka "
-"sor dezaketen fitxategiak gainidatzi egingo dira."
+msgstr "Dagoen fitxategi bat ordezten baduzu, bere edukia gainidatziko da."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1114
+#: libnautilus-private/nautilus-file-operations.c:1104
 msgid "If you replace an existing file, its contents will be overwritten."
 msgstr "Dagoen fitxategi bat ordezten baduzu, bere edukia gainidatziko da."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1127
-#: ../libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file-operations.c:1117
+#: libnautilus-private/nautilus-file-operations.c:1136
 msgid "Conflict While Copying"
 msgstr "Gatazka sortu da kopiatzean"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1128
-#: ../libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:1118
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "_Replace"
 msgstr "_Ordeztu"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "Replace _All"
 msgstr "Ordeztu _denak"
 
@@ -1621,15 +1793,15 @@ msgstr "Ordeztu _denak"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:1205
-#: ../libnautilus-private/nautilus-file.c:4728
-#: ../src/file-manager/fm-directory-view.c:8479
+#: libnautilus-private/nautilus-file-operations.c:1195
+#: libnautilus-private/nautilus-file.c:4749
+#: src/file-manager/fm-directory-view.c:7905
 #, c-format
 msgid "link to %s"
 msgstr "%s(e)rako esteka"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:1209
+#: libnautilus-private/nautilus-file-operations.c:1199
 #, c-format
 msgid "another link to %s"
 msgstr "%s(e)rako beste esteka bat"
@@ -1638,25 +1810,25 @@ msgstr "%s(e)rako beste esteka bat"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:1225
+#: libnautilus-private/nautilus-file-operations.c:1215
 #, c-format
 msgid "%dst link to %s"
 msgstr "%2$s(e)rako %1$d. esteka"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:1229
+#: libnautilus-private/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%2$s(e)rako %1$d. esteka"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:1233
+#: libnautilus-private/nautilus-file-operations.c:1223
 #, c-format
 msgid "%drd link to %s"
 msgstr "%2$s(e)rako %1$d. esteka"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1227
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s(e)rako %1$d. esteka"
@@ -1666,12 +1838,12 @@ msgstr "%2$s(e)rako %1$d. esteka"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1258
+#: libnautilus-private/nautilus-file-operations.c:1248
 msgid " (copy)"
 msgstr " (kopia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1260
+#: libnautilus-private/nautilus-file-operations.c:1250
 msgid " (another copy)"
 msgstr " (beste kopia bat)"
 
@@ -1679,36 +1851,36 @@ msgstr " (beste kopia bat)"
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1263
-#: ../libnautilus-private/nautilus-file-operations.c:1265
-#: ../libnautilus-private/nautilus-file-operations.c:1267
-#: ../libnautilus-private/nautilus-file-operations.c:1277
+#: libnautilus-private/nautilus-file-operations.c:1253
+#: libnautilus-private/nautilus-file-operations.c:1255
+#: libnautilus-private/nautilus-file-operations.c:1257
+#: libnautilus-private/nautilus-file-operations.c:1267
 msgid "th copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1270
+#: libnautilus-private/nautilus-file-operations.c:1260
 msgid "st copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1272
+#: libnautilus-private/nautilus-file-operations.c:1262
 msgid "nd copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1274
+#: libnautilus-private/nautilus-file-operations.c:1264
 msgid "rd copy)"
 msgstr ". kopia)"
 
 #. localizers: appended to first file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1291
+#: libnautilus-private/nautilus-file-operations.c:1281
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopia)%s"
 
 #. localizers: appended to second file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1293
+#: libnautilus-private/nautilus-file-operations.c:1283
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (beste kopia bat)%s"
@@ -1717,317 +1889,327 @@ msgstr "%s (beste kopia bat)%s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1296
-#: ../libnautilus-private/nautilus-file-operations.c:1298
-#: ../libnautilus-private/nautilus-file-operations.c:1300
-#: ../libnautilus-private/nautilus-file-operations.c:1309
+#: libnautilus-private/nautilus-file-operations.c:1286
+#: libnautilus-private/nautilus-file-operations.c:1288
+#: libnautilus-private/nautilus-file-operations.c:1290
+#: libnautilus-private/nautilus-file-operations.c:1299
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x1st file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1303
+#: libnautilus-private/nautilus-file-operations.c:1293
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x2nd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1305
+#: libnautilus-private/nautilus-file-operations.c:1295
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x3rd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1307
+#: libnautilus-private/nautilus-file-operations.c:1297
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:1407
+#: libnautilus-private/nautilus-file-operations.c:1397
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:1415
+#: libnautilus-private/nautilus-file-operations.c:1405
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1611
-#: ../libnautilus-private/nautilus-file-operations.c:2211
-#: ../libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:1601
+#: libnautilus-private/nautilus-file-operations.c:2194
+#: libnautilus-private/nautilus-file-operations.c:2356
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d ezezaguna"
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:1948
+#: libnautilus-private/nautilus-file-operations.c:1931
 msgid "Moving files to the Trash"
 msgstr "Fitxategiak zakarrontzira eramaten"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:1950
+#: libnautilus-private/nautilus-file-operations.c:1933
+#, fuzzy
 msgid "Throwing out file:"
-msgstr "Fitxategia botatzen:"
+msgstr "Fitxategiaren jabea"
 
 #. localizers: label prepended to the name of the current file moved
-#: ../libnautilus-private/nautilus-file-operations.c:1952
-#: ../libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1946
 msgid "Moving"
 msgstr "Lekuz aldatzen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1953
+#: libnautilus-private/nautilus-file-operations.c:1936
 msgid "Preparing to Move to Trash..."
 msgstr "Zakarrontzira eramateko prestatzen..."
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:1959
+#: libnautilus-private/nautilus-file-operations.c:1942
 msgid "Moving files"
 msgstr "Fitxategiak lekuz aldatzen"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:1961
+#: libnautilus-private/nautilus-file-operations.c:1944
+#, fuzzy
 msgid "Moving file:"
-msgstr "Fitxategia lekuz aldatzen:"
+msgstr "Fitxategiak lekuz aldatzen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1964
+#: libnautilus-private/nautilus-file-operations.c:1947
 msgid "Preparing To Move..."
 msgstr "Lekuz aldatzeko prestatzen..."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1948
 msgid "Finishing Move..."
 msgstr "Lekuz aldatzez bukatzen..."
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:1973
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Creating links to files"
 msgstr "Fitxategietarako estekak sortzen"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:1975
+#: libnautilus-private/nautilus-file-operations.c:1958
+#, fuzzy
 msgid "Linking file:"
-msgstr "Estekatze-fitxategia:"
+msgstr "Estekatzen"
 
 #. localizers: label prepended to the name of the current file linked
-#: ../libnautilus-private/nautilus-file-operations.c:1977
+#: libnautilus-private/nautilus-file-operations.c:1960
 msgid "Linking"
 msgstr "Estekatzen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1961
 msgid "Preparing to Create Links..."
 msgstr "Estekak sortzeko prestatzen..."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:1962
 msgid "Finishing Creating Links..."
 msgstr "Estekak sortzea amaitzen..."
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:1985
+#: libnautilus-private/nautilus-file-operations.c:1968
 msgid "Copying files"
 msgstr "Fitxategiak kopiatzen"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:1987
+#: libnautilus-private/nautilus-file-operations.c:1970
+#, fuzzy
 msgid "Copying file:"
-msgstr "KOpiatze-fitxategia:"
+msgstr "Fitxategiak kopiatzen"
 
 #. localizers: label prepended to the name of the current file copied
-#: ../libnautilus-private/nautilus-file-operations.c:1989
+#: libnautilus-private/nautilus-file-operations.c:1972
 msgid "Copying"
 msgstr "Kopiatzen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1990
+#: libnautilus-private/nautilus-file-operations.c:1973
 msgid "Preparing To Copy..."
 msgstr "Kopiatzeko prestatzen..."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2008
+#: libnautilus-private/nautilus-file-operations.c:1991
 msgid "You cannot copy items into the trash."
 msgstr "Ezin duzu zakarrontzian elementurik kopiatu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2009
+#: libnautilus-private/nautilus-file-operations.c:1992
 msgid "You cannot create links inside the trash."
 msgstr "Ezin duzu zakarrontzian estekarik sortu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2010
+#: libnautilus-private/nautilus-file-operations.c:1993
 msgid "Files and folders can only be moved into the trash."
 msgstr "Fitxategiak eta karpetak bakarrik eraman daitezke zakarrontzira."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2034
+#: libnautilus-private/nautilus-file-operations.c:2017
 msgid "You cannot move this trash folder."
 msgstr "Ezin duzu zakarrontzi-karpeta lekuz aldatu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2035
+#: libnautilus-private/nautilus-file-operations.c:2018
 msgid "You cannot copy this trash folder."
 msgstr "Ezin duzu zakarrontzi-karpeta kopiatu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2036
+#: libnautilus-private/nautilus-file-operations.c:2019
 msgid "A trash folder is used for storing items moved to the trash."
 msgstr ""
 "Zakarrontzi-karpeta bat zakarrontzira eramandako elementuak gordetzeko "
 "erabiltzen da."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2038
+#: libnautilus-private/nautilus-file-operations.c:2021
 msgid "Can't Change Trash Location"
 msgstr "Ezin da zakarrontziaren kokalekua aldatu"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2039
+#: libnautilus-private/nautilus-file-operations.c:2022
 msgid "Can't Copy Trash"
 msgstr "Ezin da zakarrontzia kopiatu"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2063
+#: libnautilus-private/nautilus-file-operations.c:2046
 msgid "You cannot move a folder into itself."
 msgstr "Karpeta bat ezin da karpeta beraren barrura eraman."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2064
+#: libnautilus-private/nautilus-file-operations.c:2047
 msgid "You cannot copy a folder into itself."
 msgstr "Karpeta bat ezin da karpeta beraren barruan kopiatu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2065
+#: libnautilus-private/nautilus-file-operations.c:2048
 msgid "The destination folder is inside the source folder."
 msgstr "Helburuko karpeta iturriko karpetaren barruan dago."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2067
+#: libnautilus-private/nautilus-file-operations.c:2050
 msgid "Can't Move Into Self"
 msgstr "Ezin da beraren barrura eraman"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2068
+#: libnautilus-private/nautilus-file-operations.c:2051
 msgid "Can't Copy Into Self"
 msgstr "Ezin da beraren barruan kopiatu"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2081
+#: libnautilus-private/nautilus-file-operations.c:2064
 msgid "You cannot copy a file over itself."
 msgstr "Ezin duzu fitxategia bere gainean kopiatu."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2082
+#: libnautilus-private/nautilus-file-operations.c:2065
 msgid "The destination and source are the same file."
 msgstr "Helburuko eta iturriko fitxategiak berdinak dira."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2083
+#: libnautilus-private/nautilus-file-operations.c:2066
 msgid "Can't Copy Over Self"
 msgstr "Ezin da bere gainean kopiatu"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2135
-#: ../libnautilus-private/nautilus-file-operations.c:2274
+#: libnautilus-private/nautilus-file-operations.c:2118
+#: libnautilus-private/nautilus-file-operations.c:2258
 msgid "You do not have permissions to write to the destination."
 msgstr "Ez duzu helburuan idazteko baimenik."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2137
-#: ../libnautilus-private/nautilus-file-operations.c:2276
+#: libnautilus-private/nautilus-file-operations.c:2120
+#: libnautilus-private/nautilus-file-operations.c:2260
 msgid "There is no space on the destination."
 msgstr "Ez dago lekurik helburuan."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2139
+#: libnautilus-private/nautilus-file-operations.c:2122
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "\"%s\" errorea gertatu da karpeta berria sortzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2144
+#: libnautilus-private/nautilus-file-operations.c:2127
 msgid "Error creating new folder."
 msgstr "Errorea karpeta berria sortzean"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2144
+#: libnautilus-private/nautilus-file-operations.c:2127
 msgid "Error Creating New Folder"
 msgstr "Errorea karpeta berria sortzean"
 
 #. localizers: the initial name of a new folder
-#: ../libnautilus-private/nautilus-file-operations.c:2239
+#: libnautilus-private/nautilus-file-operations.c:2222
 msgid "untitled folder"
 msgstr "izenik gabeko karpeta"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2278
+#: libnautilus-private/nautilus-file-operations.c:2262
 #, c-format
 msgid "Error \"%s\" creating new document."
 msgstr "\"%s\" errorea gertatu da dokumentu berria sortzean."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2283
+#: libnautilus-private/nautilus-file-operations.c:2267
 msgid "Error creating new document."
 msgstr "Errorea dokumentu berria sortzean"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2283
+#: libnautilus-private/nautilus-file-operations.c:2267
 msgid "Error Creating New Document"
 msgstr "Errorea dokumentu berria sortzean"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2505
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "new file"
 msgstr "fitxategi berria"
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:2570
+#: libnautilus-private/nautilus-file-operations.c:2486
 msgid "Deleting files"
 msgstr "Fitxategiak ezabatzen"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:2572
-#: ../libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2488
+#: libnautilus-private/nautilus-file-operations.c:2523
 msgid "Files deleted:"
 msgstr "Ezabatutako fitxategiak:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: ../libnautilus-private/nautilus-file-operations.c:2574
-#: ../libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2490
+#: libnautilus-private/nautilus-file-operations.c:2525
 msgid "Deleting"
 msgstr "Ezabatzen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2575
+#: libnautilus-private/nautilus-file-operations.c:2491
 msgid "Preparing to Delete files..."
 msgstr "Fitxategiak ezabatzeko prestatzen..."
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2521
 msgid "Emptying the Trash"
 msgstr "Zakarrontzia husten"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2526
 msgid "Preparing to Empty the Trash..."
 msgstr "Zakarrontzia husteko prestatzen..."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2646
+#: libnautilus-private/nautilus-file-operations.c:2562
+#, fuzzy
 msgid "Empty all of the items from the trash?"
-msgstr "Zakarrontziko elementu guztiak betiko ezabatu?"
+msgstr ""
+"Ziur zaude zakarrontziko elementu guztiak betiko ezabatu nahi dituzula?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2649
+#: libnautilus-private/nautilus-file-operations.c:2565
+#, fuzzy
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
 msgstr "Zakarrontzia hustutzen baduzu, elementuak betirako ezabatuko dira."
-"Kontutan izan bakoitza banaka ezaba daitekela."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2671
+#. name, stock id
+#: libnautilus-private/nautilus-file-operations.c:2587
+#: src/file-manager/fm-directory-view.c:5767
+#: src/file-manager/fm-directory-view.c:6314
 msgid "_Empty Trash"
 msgstr "Hustu _zakarrontzia"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:480
-#: ../libnautilus-private/nautilus-global-preferences.c:512
-#: ../nautilus-computer.desktop.in.h:1
+#: libnautilus-private/nautilus-file-utilities.c:442
+#: libnautilus-private/nautilus-global-preferences.c:534
+#: nautilus-computer.desktop.in.h:1
 msgid "Computer"
 msgstr "Ordenagailua"
 
 #
-#: ../libnautilus-private/nautilus-file-utilities.c:482
+#: libnautilus-private/nautilus-file-utilities.c:444
 msgid "Network"
 msgstr "Sarea"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:484
+#: libnautilus-private/nautilus-file-utilities.c:446
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
 #
-#: ../libnautilus-private/nautilus-file-utilities.c:486
+#: libnautilus-private/nautilus-file-utilities.c:448
 msgid "Themes"
 msgstr "_Times"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:488
+#: libnautilus-private/nautilus-file-utilities.c:450
+#, fuzzy
 msgid "CD/DVD Creator"
-msgstr "CD/DVD sortzailea"
+msgstr "CD sortzailea"
 
 #
-#: ../libnautilus-private/nautilus-file-utilities.c:490
+#: libnautilus-private/nautilus-file-utilities.c:452
 msgid "Windows Network"
 msgstr "Windows sarea"
 
-#. translators: this is the title of the "dns-sd:///" location
-#: ../libnautilus-private/nautilus-file-utilities.c:493
+#: libnautilus-private/nautilus-file-utilities.c:454
+#, fuzzy
 msgid "Services in"
 msgstr "Zerbitzuak"
 
@@ -2046,65 +2228,65 @@ msgstr "Zerbitzuak"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: ../libnautilus-private/nautilus-file.c:2944
+#: libnautilus-private/nautilus-file.c:2965
 msgid "today at 00:00:00 PM"
 msgstr "gaur, 00:00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2945
-#: ../src/nautilus-file-management-properties.c:493
+#: libnautilus-private/nautilus-file.c:2966
+#: src/nautilus-file-management-properties.c:493
 msgid "today at %-I:%M:%S %p"
 msgstr "gaur, %-I:%M:%S %p"
 
-#: ../libnautilus-private/nautilus-file.c:2947
+#: libnautilus-private/nautilus-file.c:2968
 msgid "today at 00:00 PM"
 msgstr "gaur, 00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2948
+#: libnautilus-private/nautilus-file.c:2969
 msgid "today at %-I:%M %p"
 msgstr "gaur, %-I:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:2950
+#: libnautilus-private/nautilus-file.c:2971
 msgid "today, 00:00 PM"
 msgstr "gaur, 00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2951
+#: libnautilus-private/nautilus-file.c:2972
 msgid "today, %-I:%M %p"
 msgstr "gaur, %-I:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:2953
-#: ../libnautilus-private/nautilus-file.c:2954
+#: libnautilus-private/nautilus-file.c:2974
+#: libnautilus-private/nautilus-file.c:2975
 msgid "today"
 msgstr "gaur"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: ../libnautilus-private/nautilus-file.c:2963
+#: libnautilus-private/nautilus-file.c:2984
 msgid "yesterday at 00:00:00 PM"
 msgstr "atzo, 00:00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2964
+#: libnautilus-private/nautilus-file.c:2985
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "atzo, %-I:%M:%S %p"
 
-#: ../libnautilus-private/nautilus-file.c:2966
+#: libnautilus-private/nautilus-file.c:2987
 msgid "yesterday at 00:00 PM"
 msgstr "atzo, 00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2967
+#: libnautilus-private/nautilus-file.c:2988
 msgid "yesterday at %-I:%M %p"
 msgstr "atzo, %-I:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:2969
+#: libnautilus-private/nautilus-file.c:2990
 msgid "yesterday, 00:00 PM"
 msgstr "atzo, 00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2970
+#: libnautilus-private/nautilus-file.c:2991
 msgid "yesterday, %-I:%M %p"
 msgstr "atzo, %-I:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:2972
-#: ../libnautilus-private/nautilus-file.c:2973
+#: libnautilus-private/nautilus-file.c:2993
+#: libnautilus-private/nautilus-file.c:2994
 msgid "yesterday"
 msgstr "atzo"
 
@@ -2113,78 +2295,78 @@ msgstr "atzo"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: ../libnautilus-private/nautilus-file.c:2984
+#: libnautilus-private/nautilus-file.c:3005
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "asteazkena, 0000.eko irailak 00, 00:00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2985
+#: libnautilus-private/nautilus-file.c:3006
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %Y.eko %Bk %-d, %-I:%M:%S %p"
 
-#: ../libnautilus-private/nautilus-file.c:2987
+#: libnautilus-private/nautilus-file.c:3008
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "al., 0000 urr 00, 00:00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2988
+#: libnautilus-private/nautilus-file.c:3009
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %Y %b %-d, %-I:%M:%S %p"
 
-#: ../libnautilus-private/nautilus-file.c:2990
+#: libnautilus-private/nautilus-file.c:3011
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "al., 0000 urr 00, 00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2991
+#: libnautilus-private/nautilus-file.c:3012
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %Y %b %-d, %-I:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:2993
+#: libnautilus-private/nautilus-file.c:3014
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000 urr 00, 00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2994
+#: libnautilus-private/nautilus-file.c:3015
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y %b %-d, %-I:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:2996
+#: libnautilus-private/nautilus-file.c:3017
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000 urr 00, 00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:2997
+#: libnautilus-private/nautilus-file.c:3018
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y %b %-d, %-I:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:2999
+#: libnautilus-private/nautilus-file.c:3020
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: ../libnautilus-private/nautilus-file.c:3000
+#: libnautilus-private/nautilus-file.c:3021
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%y/%m/%-d, %-I:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:3002
+#: libnautilus-private/nautilus-file.c:3023
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: ../libnautilus-private/nautilus-file.c:3003
+#: libnautilus-private/nautilus-file.c:3024
 msgid "%m/%d/%y"
 msgstr "%y/%m/%d"
 
-#: ../libnautilus-private/nautilus-file.c:4294
-#: ../src/file-manager/fm-directory-view.c:1933
+#: libnautilus-private/nautilus-file.c:4315
+#: src/file-manager/fm-directory-view.c:1859
 #, c-format
 msgid "%u item"
 msgid_plural "%u items"
 msgstr[0] "%u elementu"
 msgstr[1] "%u elementu"
 
-#: ../libnautilus-private/nautilus-file.c:4295
+#: libnautilus-private/nautilus-file.c:4316
 #, c-format
 msgid "%u folder"
 msgid_plural "%u folders"
 msgstr[0] "%u karpeta"
 msgstr[1] "%u karpeta"
 
-#: ../libnautilus-private/nautilus-file.c:4296
+#: libnautilus-private/nautilus-file.c:4317
 #, c-format
 msgid "%u file"
 msgid_plural "%u files"
@@ -2192,37 +2374,37 @@ msgstr[0] "%u fitxategi"
 msgstr[1] "%u fitxategi"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:4621
-#: ../libnautilus-private/nautilus-file.c:4637
+#: libnautilus-private/nautilus-file.c:4642
+#: libnautilus-private/nautilus-file.c:4658
 msgid "? items"
 msgstr "? elementu"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:4627
+#: libnautilus-private/nautilus-file.c:4648
 msgid "? bytes"
 msgstr "? byte"
 
-#: ../libnautilus-private/nautilus-file.c:4642
+#: libnautilus-private/nautilus-file.c:4663
 msgid "unknown type"
 msgstr "mota ezezaguna"
 
-#: ../libnautilus-private/nautilus-file.c:4645
+#: libnautilus-private/nautilus-file.c:4666
 msgid "unknown MIME type"
 msgstr "MIME mota ezezaguna"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: ../libnautilus-private/nautilus-file.c:4651
-#: ../src/file-manager/fm-properties-window.c:1306
+#: libnautilus-private/nautilus-file.c:4672
+#: src/file-manager/fm-properties-window.c:1218
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: ../libnautilus-private/nautilus-file.c:4684
+#: libnautilus-private/nautilus-file.c:4705
 msgid "program"
 msgstr "programa"
 
-#: ../libnautilus-private/nautilus-file.c:4702
+#: libnautilus-private/nautilus-file.c:4723
 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 "
@@ -2232,7 +2414,7 @@ msgstr ""
 "Seguru asko gnome-vfs.keys fitxategia okerreko lekuan izango duzu edo ezingo "
 "du aurkitu beste arrazoiren batengatik."
 
-#: ../libnautilus-private/nautilus-file.c:4706
+#: libnautilus-private/nautilus-file.c:4727
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -2241,219 +2423,219 @@ msgstr ""
 "Ez du \"%s\" mime-motaren azalpena aurkitu (fitxategia \"%s\" da), "
 "jakinarazi gnome-vfs posta-zerrendari."
 
-#: ../libnautilus-private/nautilus-file.c:4722
+#: libnautilus-private/nautilus-file.c:4743
 msgid "link"
 msgstr "esteka"
 
-#: ../libnautilus-private/nautilus-file.c:4742
+#: libnautilus-private/nautilus-file.c:4763
 msgid "link (broken)"
 msgstr "esteka (hautsita)"
 
-#: ../libnautilus-private/nautilus-file.c:6170
-#: ../libnautilus-private/nautilus-global-preferences.c:518
-#: ../libnautilus-private/nautilus-trash-directory.c:343
+#: libnautilus-private/nautilus-file.c:6191
+#: libnautilus-private/nautilus-global-preferences.c:540
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Zakarrontzia"
 
 #
-#: ../libnautilus-private/nautilus-global-preferences.c:70
+#: libnautilus-private/nautilus-global-preferences.c:100
 msgid "_Always"
 msgstr "_Beti"
 
 #
-#: ../libnautilus-private/nautilus-global-preferences.c:71
+#: libnautilus-private/nautilus-global-preferences.c:101
 msgid "_Local File Only"
 msgstr "_Fitxategi lokalak bakarrik"
 
 #
-#: ../libnautilus-private/nautilus-global-preferences.c:72
+#: libnautilus-private/nautilus-global-preferences.c:102
 msgid "_Never"
 msgstr "_Inoiz ez"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:78
-#: ../src/nautilus-file-management-properties.glade.h:14
+#: libnautilus-private/nautilus-global-preferences.c:108
+#: src/nautilus-file-management-properties.glade.h:14
 #, no-c-format
 msgid "25%"
 msgstr "% 25"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:80
-#: ../src/nautilus-file-management-properties.glade.h:20
+#: libnautilus-private/nautilus-global-preferences.c:110
+#: src/nautilus-file-management-properties.glade.h:20
 #, no-c-format
 msgid "50%"
 msgstr "% 50"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:82
-#: ../src/nautilus-file-management-properties.glade.h:23
+#: libnautilus-private/nautilus-global-preferences.c:112
+#: src/nautilus-file-management-properties.glade.h:23
 #, no-c-format
 msgid "75%"
 msgstr "% 75"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:84
-#: ../src/nautilus-file-management-properties.glade.h:8
+#: libnautilus-private/nautilus-global-preferences.c:114
+#: src/nautilus-file-management-properties.glade.h:8
 #, no-c-format
 msgid "100%"
 msgstr "% 100"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:86
-#: ../src/nautilus-file-management-properties.glade.h:10
+#: libnautilus-private/nautilus-global-preferences.c:116
+#: src/nautilus-file-management-properties.glade.h:10
 #, no-c-format
 msgid "150%"
 msgstr "% 150"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:88
-#: ../src/nautilus-file-management-properties.glade.h:12
+#: libnautilus-private/nautilus-global-preferences.c:118
+#: src/nautilus-file-management-properties.glade.h:12
 #, no-c-format
 msgid "200%"
 msgstr "% 200"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:90
-#: ../src/nautilus-file-management-properties.glade.h:17
+#: libnautilus-private/nautilus-global-preferences.c:120
+#: src/nautilus-file-management-properties.glade.h:17
 #, no-c-format
 msgid "400%"
 msgstr "% 400"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:95
+#: libnautilus-private/nautilus-global-preferences.c:125
 msgid "100 K"
 msgstr "100 K"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:96
+#: libnautilus-private/nautilus-global-preferences.c:126
 msgid "500 K"
 msgstr "500 K"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:97
-#: ../src/nautilus-file-management-properties.glade.h:3
+#: libnautilus-private/nautilus-global-preferences.c:127
+#: src/nautilus-file-management-properties.glade.h:3
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:98
-#: ../src/nautilus-file-management-properties.glade.h:15
+#: libnautilus-private/nautilus-global-preferences.c:128
+#: src/nautilus-file-management-properties.glade.h:15
 msgid "3 MB"
 msgstr "3 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:99
-#: ../src/nautilus-file-management-properties.glade.h:18
+#: libnautilus-private/nautilus-global-preferences.c:129
+#: src/nautilus-file-management-properties.glade.h:18
 msgid "5 MB"
 msgstr "5 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:100
-#: ../src/nautilus-file-management-properties.glade.h:4
+#: libnautilus-private/nautilus-global-preferences.c:130
+#: src/nautilus-file-management-properties.glade.h:4
 msgid "10 MB"
 msgstr "10 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:101
-#: ../src/nautilus-file-management-properties.glade.h:6
+#: libnautilus-private/nautilus-global-preferences.c:131
+#: src/nautilus-file-management-properties.glade.h:6
 msgid "100 MB"
 msgstr "100 MB"
 
 #
-#: ../libnautilus-private/nautilus-global-preferences.c:107
+#: libnautilus-private/nautilus-global-preferences.c:137
 msgid "Activate items with a _single click"
 msgstr "Aktibatu _elementuak klik bakarraz"
 
 #
-#: ../libnautilus-private/nautilus-global-preferences.c:111
+#: libnautilus-private/nautilus-global-preferences.c:141
 msgid "Activate items with a _double click"
 msgstr "Aktibatu elementuak bi klik e_ginez"
 
 #
-#: ../libnautilus-private/nautilus-global-preferences.c:119
+#: libnautilus-private/nautilus-global-preferences.c:149
 msgid "E_xecute files when they are clicked"
 msgstr "E_xekutatu fitxategiak klik egiten zaienean"
 
 #
-#: ../libnautilus-private/nautilus-global-preferences.c:123
+#: libnautilus-private/nautilus-global-preferences.c:153
 msgid "Display _files when they are clicked"
 msgstr "Bistaratu _fitxategiak klik egiten zaienean"
 
 #
-#: ../libnautilus-private/nautilus-global-preferences.c:127
-#: ../src/nautilus-file-management-properties.glade.h:70
+#: libnautilus-private/nautilus-global-preferences.c:157
+#: src/nautilus-file-management-properties.glade.h:70
 msgid "_Ask each time"
 msgstr "Gal_detu aldi bakoitzean"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:135
+#: libnautilus-private/nautilus-global-preferences.c:165
 msgid "Search for files by file name only"
 msgstr "Fitxategiak fitxategi-izenaren arabera bakarrik bilatu"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:139
+#: libnautilus-private/nautilus-global-preferences.c:169
 msgid "Search for files by file name and file properties"
 msgstr ""
 "Bilatu fitxategiak fitxategi-izenaren eta fitxategi-propietateen arabera"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:146
-#: ../src/file-manager/fm-icon-container.c:500
-#: ../src/nautilus-file-management-properties.glade.h:54
+#: libnautilus-private/nautilus-global-preferences.c:176
+#: src/file-manager/fm-icon-container.c:499
+#: src/nautilus-file-management-properties.glade.h:54
 msgid "Icon View"
 msgstr "Ikono-ikuspegia"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:147
-#: ../src/file-manager/fm-list-view.c:1475
-#: ../src/nautilus-file-management-properties.glade.h:56
+#: libnautilus-private/nautilus-global-preferences.c:177
+#: src/file-manager/fm-list-view.c:1160
+#: src/nautilus-file-management-properties.glade.h:56
 msgid "List View"
 msgstr "Zerrenda-ikuspegia"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:152
+#: libnautilus-private/nautilus-global-preferences.c:182
 msgid "Manually"
 msgstr "Eskuz"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:154
-#: ../src/nautilus-file-management-properties.glade.h:44
+#: libnautilus-private/nautilus-global-preferences.c:184
+#: src/nautilus-file-management-properties.glade.h:44
 msgid "By Name"
 msgstr "Izenaren arabera"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:155
-#: ../src/nautilus-file-management-properties.glade.h:45
+#: libnautilus-private/nautilus-global-preferences.c:185
+#: src/nautilus-file-management-properties.glade.h:45
 msgid "By Size"
 msgstr "Tamainaren arabera"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:156
-#: ../src/nautilus-file-management-properties.glade.h:46
+#: libnautilus-private/nautilus-global-preferences.c:186
+#: src/nautilus-file-management-properties.glade.h:46
 msgid "By Type"
 msgstr "Motaren arabera"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:157
-#: ../src/nautilus-file-management-properties.glade.h:43
+#: libnautilus-private/nautilus-global-preferences.c:187
+#: src/nautilus-file-management-properties.glade.h:43
 msgid "By Modification Date"
 msgstr "Aldatze-dataren arabera"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:158
-#: ../src/nautilus-file-management-properties.glade.h:42
+#: libnautilus-private/nautilus-global-preferences.c:188
+#: src/nautilus-file-management-properties.glade.h:42
 msgid "By Emblems"
 msgstr "Ikurren arabera"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:163
+#: libnautilus-private/nautilus-global-preferences.c:193
 msgid "8"
 msgstr "8"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:164
+#: libnautilus-private/nautilus-global-preferences.c:194
 msgid "10"
 msgstr "10"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:165
+#: libnautilus-private/nautilus-global-preferences.c:195
 msgid "12"
 msgstr "12"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:166
+#: libnautilus-private/nautilus-global-preferences.c:196
 msgid "14"
 msgstr "14"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:167
+#: libnautilus-private/nautilus-global-preferences.c:197
 msgid "16"
 msgstr "16"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:168
+#: libnautilus-private/nautilus-global-preferences.c:198
 msgid "18"
 msgstr "18"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:169
+#: libnautilus-private/nautilus-global-preferences.c:199
 msgid "20"
 msgstr "20"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:170
+#: libnautilus-private/nautilus-global-preferences.c:200
 msgid "22"
 msgstr "22"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:171
+#: libnautilus-private/nautilus-global-preferences.c:201
 msgid "24"
 msgstr "24"
 
@@ -2465,37 +2647,163 @@ msgstr "24"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: ../libnautilus-private/nautilus-global-preferences.c:506
+#: libnautilus-private/nautilus-global-preferences.c:528
 #, c-format
 msgid "%s's Home"
 msgstr "%s - etxea"
 
 #
-#: ../libnautilus-private/nautilus-icon-container.c:2119
+#: libnautilus-private/nautilus-icon-canvas-item.c:2892
+msgid "editable text"
+msgstr "testu editagarria"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2893
+msgid "the editable label"
+msgstr "etiketa editagarria"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2900
+msgid "additional text"
+msgstr "testu osagarria"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2901
+msgid "some more text"
+msgstr "testu gehiago"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2908
+msgid "highlighted for selection"
+msgstr "hautatzeko nabarmenduta"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2909
+msgid "whether we are highlighted for a selection"
+msgstr "gu hautatzeko nabarmenduta gauden ala ez adierazten du"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2916
+msgid "highlighted as keyboard focus"
+msgstr "teklatuaren foku gisa nabarmenduta"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2917
+msgid "whether we are highlighted to render keyboard focus"
+msgstr ""
+"Teklatuaren fokua errendatzeko nabarmenduta gauden ala ez adierazten du"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2925
+msgid "highlighted for drop"
+msgstr "jaregiteko nabarmenduta"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2926
+msgid "whether we are highlighted for a D&D drop"
+msgstr "arrastatu eta jaregiteko nabarmenduta gauden ala ez adierazten du"
+
+#
+#: libnautilus-private/nautilus-icon-container.c:2107
 msgid "The selection rectangle"
 msgstr "Hautapen-errektangelua"
 
-#: ../libnautilus-private/nautilus-icon-container.c:4323
-msgid "Normal Alpha"
-msgstr "Alfa normala"
+#
+#: libnautilus-private/nautilus-icon-container.c:4254
+msgid "Frame Text"
+msgstr "Marko-testua"
+
+#: libnautilus-private/nautilus-icon-container.c:4255
+msgid "Draw a frame around unselected text"
+msgstr "Marraztu markoa hautatu gabeko testuaren inguruan"
+
+#
+#: libnautilus-private/nautilus-icon-container.c:4261
+msgid "Selection Box Color"
+msgstr "Hautapen-koadroaren kolorea"
+
+#
+#: libnautilus-private/nautilus-icon-container.c:4262
+msgid "Color of the selection box"
+msgstr "Hautapen-koadroaren kolorea"
+
+#
+#: libnautilus-private/nautilus-icon-container.c:4267
+msgid "Selection Box Alpha"
+msgstr "Alfaren hautapen-koadroa"
+
+#: libnautilus-private/nautilus-icon-container.c:4268
+msgid "Opacity of the selection box"
+msgstr "Hautapen-koadroaren opakutasuna"
+
+#: libnautilus-private/nautilus-icon-container.c:4275
+msgid "Highlight Alpha"
+msgstr "Nabarmendu alfa"
+
+#: libnautilus-private/nautilus-icon-container.c:4276
+msgid "Opacity of the highlight for selected icons"
+msgstr "Hautatutako ikonoen nabarmentzearen opakutasuna"
 
-#: ../libnautilus-private/nautilus-icon-container.c:4324
-msgid "Opacity of the normal icons if frame_text is set"
-msgstr "Ikono normalen opakotasuna testu-markoa ezartzen bada"
+#: libnautilus-private/nautilus-icon-container.c:4282
+msgid "Light Info Color"
+msgstr "Informazio-kolore argia"
+
+#: libnautilus-private/nautilus-icon-container.c:4283
+msgid "Color used for information text against a dark background"
+msgstr "Informazio-testuan erabiltzeko kolorea, atzeko plano ilunarekin"
+
+#
+#: libnautilus-private/nautilus-icon-container.c:4288
+msgid "Dark Info Color"
+msgstr "Informazio-kolore iluna"
 
-#: ../libnautilus-private/nautilus-icon-dnd.c:790
+#: libnautilus-private/nautilus-icon-container.c:4289
+msgid "Color used for information text against a light background"
+msgstr "Informazio-testuan erabiltzeko kolorea, atzeko plano argiarekin"
+
+#: libnautilus-private/nautilus-icon-dnd.c:754
+msgid ""
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
+msgstr ""
+"Nahi duzu eskuzko diseinura aldatu eta elementu hau jaregin diozun lekuan "
+"utzi? Ekintza horrek eskuzko diseinua ezarriko du."
+
+#: libnautilus-private/nautilus-icon-dnd.c:756
+#: libnautilus-private/nautilus-icon-dnd.c:760
+#: libnautilus-private/nautilus-icon-dnd.c:765
+#: libnautilus-private/nautilus-icon-dnd.c:768
+msgid "This folder uses automatic layout."
+msgstr "Karpeta honek diseinu automatikoa du."
+
+#: libnautilus-private/nautilus-icon-dnd.c:758
+msgid ""
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
+msgstr ""
+"Nahi duzu eskuzko diseinura aldatu eta elementu hauek jaregin diezun lekuan "
+"utzi? Ekintza horrek eskuzko diseinua ezarriko du."
+
+#: libnautilus-private/nautilus-icon-dnd.c:764
+msgid ""
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
+msgstr ""
+"Nahi duzu eskuzko diseinura aldatu eta elementu hau jaregin diozun lekuan "
+"utzi?"
+
+#: libnautilus-private/nautilus-icon-dnd.c:767
+msgid ""
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
+msgstr ""
+"Nahi duzu eskuzko diseinura aldatu eta elementu hauek jaregin diezun lekuan "
+"utzi?"
+
+#: libnautilus-private/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Eskuzko diseinura aldatu?"
 
-#: ../libnautilus-private/nautilus-icon-dnd.c:791
+#: libnautilus-private/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Aldatu"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:136
+#: libnautilus-private/nautilus-program-choosing.c:136
 msgid "Open Failed, would you like to choose another application?"
 msgstr "Hust egin du irekitzean, beste aplikazio bat aukeratu nahi duzu?"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:137
+#: libnautilus-private/nautilus-program-choosing.c:137
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
@@ -2504,11 +2812,11 @@ msgstr ""
 "\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
 "helbideetako fitxategiak atzitu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:142
+#: libnautilus-private/nautilus-program-choosing.c:142
 msgid "Open Failed, would you like to choose another action?"
 msgstr "Hust egin du irekitzean, beste ekintza aukeratu nahi duzu?"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:143
+#: libnautilus-private/nautilus-program-choosing.c:143
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
@@ -2517,12 +2825,12 @@ msgstr ""
 "Ekintza lehenetsiak ezin du \"%s\" ireki, ezin dituelako \"%s\" helbideetako "
 "fitxategiak atzitu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:150
-#: ../libnautilus-private/nautilus-program-choosing.c:183
+#: libnautilus-private/nautilus-program-choosing.c:150
+#: libnautilus-private/nautilus-program-choosing.c:183
 msgid "Can't Open Location"
 msgstr "Ezin da Helbidea ireki"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:169
+#: libnautilus-private/nautilus-program-choosing.c:169
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
@@ -2531,7 +2839,7 @@ msgstr ""
 "\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
 "helbideetako fitxategiak atzitu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:172
+#: libnautilus-private/nautilus-program-choosing.c:172
 msgid ""
 "No other applications are available to view this file.  If you copy this "
 "file onto your computer, you may be able to open it."
@@ -2539,7 +2847,7 @@ msgstr ""
 "Ez dago beste aplikaziorik erabilgarri fitxategi hau ikusteko. Fitxategia "
 "zure ordenagailuan kopiatzen baduzu, ireki ahal izango duzu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:176
+#: libnautilus-private/nautilus-program-choosing.c:176
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\"."
@@ -2548,7 +2856,7 @@ msgstr ""
 "Ekintza lehenetsiak ezin du \"%s\" ireki, ezin dituelako \"%s\" helbideetako "
 "fitxategiak atzitu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:178
+#: libnautilus-private/nautilus-program-choosing.c:178
 msgid ""
 "No other actions are available to view this file.  If you copy this file "
 "onto your computer, you may be able to open it."
@@ -2556,8 +2864,8 @@ msgstr ""
 "Ez dago beste aplikaziorik erabilgarri fitxategi hau ikusteko. Fitxategia "
 "zure ordenagailuan kopiatzen baduzu, ireki ahal izango duzu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:492
-#: ../libnautilus-private/nautilus-program-choosing.c:723
+#: libnautilus-private/nautilus-program-choosing.c:492
+#: libnautilus-private/nautilus-program-choosing.c:723
 #, c-format
 msgid "Opening %s"
 msgstr "%s irekitzen"
@@ -2566,108 +2874,108 @@ msgstr "%s irekitzen"
 #. * and I found these in other places to reuse. We should make them
 #. * better later.
 #. Shouldn't have gotten this error unless there's a : separator.
-#: ../libnautilus-private/nautilus-program-choosing.c:580
-#: ../libnautilus-private/nautilus-program-choosing.c:591
-#: ../libnautilus-private/nautilus-program-choosing.c:599
-#: ../libnautilus-private/nautilus-program-choosing.c:604
-#: ../src/nautilus-window-manage-views.c:1358
-#: ../src/nautilus-window-manage-views.c:1364
-#: ../src/nautilus-window-manage-views.c:1392
-#: ../src/nautilus-window-manage-views.c:1400
-#: ../src/nautilus-window-manage-views.c:1406
-#: ../src/nautilus-window-manage-views.c:1427
+#: libnautilus-private/nautilus-program-choosing.c:580
+#: libnautilus-private/nautilus-program-choosing.c:591
+#: libnautilus-private/nautilus-program-choosing.c:599
+#: libnautilus-private/nautilus-program-choosing.c:604
+#: src/nautilus-window-manage-views.c:1344
+#: src/nautilus-window-manage-views.c:1350
+#: src/nautilus-window-manage-views.c:1378
+#: src/nautilus-window-manage-views.c:1386
+#: src/nautilus-window-manage-views.c:1392
+#: src/nautilus-window-manage-views.c:1413
 #, c-format
 msgid "Couldn't display \"%s\"."
 msgstr "Ezin izan da \"%s\" bistaratu."
 
 #
-#: ../libnautilus-private/nautilus-program-choosing.c:593
-#: ../libnautilus-private/nautilus-program-choosing.c:890
-#: ../libnautilus-private/nautilus-program-choosing.c:961
+#: libnautilus-private/nautilus-program-choosing.c:593
+#: libnautilus-private/nautilus-program-choosing.c:888
+#: libnautilus-private/nautilus-program-choosing.c:957
 msgid "There was an error launching the application."
 msgstr "Errorea aplikazioa abiaraztean."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:601
-#: ../src/nautilus-window-manage-views.c:1402
+#: libnautilus-private/nautilus-program-choosing.c:601
+#: src/nautilus-window-manage-views.c:1388
 msgid "The attempt to log in failed."
 msgstr "Saio-hasierak huts egin du."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:606
-#: ../src/nautilus-window-manage-views.c:1408
+#: libnautilus-private/nautilus-program-choosing.c:606
+#: src/nautilus-window-manage-views.c:1394
 msgid "Access was denied."
 msgstr "Atzipena debekatu da."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:611
-#: ../src/nautilus-window-manage-views.c:1419
+#: libnautilus-private/nautilus-program-choosing.c:611
+#: src/nautilus-window-manage-views.c:1405
 #, c-format
 msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Ezin izan da \"%s\" bistaratu, \"%s\" ostalaria ez delako aurkitu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:614
-#: ../src/nautilus-window-manage-views.c:1422
+#: libnautilus-private/nautilus-program-choosing.c:614
+#: src/nautilus-window-manage-views.c:1408
 msgid ""
 "Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Egiaztatu ondo idatzita dagoela eta zure proxy-ezarpenak zuzenak direla."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:619
-#: ../src/nautilus-connect-server-dialog.c:142
-#: ../src/nautilus-window-manage-views.c:1380
+#: libnautilus-private/nautilus-program-choosing.c:619
+#: src/nautilus-connect-server-dialog.c:140
+#: src/nautilus-window-manage-views.c:1366
 #, c-format
 msgid "\"%s\" is not a valid location."
 msgstr "\"%s\" ez da baliozko helbidea."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:622
-#: ../libnautilus-private/nautilus-program-choosing.c:629
-#: ../src/nautilus-connect-server-dialog.c:144
-#: ../src/nautilus-property-browser.c:1152
-#: ../src/nautilus-window-manage-views.c:1375
-#: ../src/nautilus-window-manage-views.c:1383
+#: libnautilus-private/nautilus-program-choosing.c:622
+#: libnautilus-private/nautilus-program-choosing.c:629
+#: src/nautilus-connect-server-dialog.c:142
+#: src/nautilus-property-browser.c:1097
+#: src/nautilus-window-manage-views.c:1361
+#: src/nautilus-window-manage-views.c:1369
 msgid "Please check the spelling and try again."
 msgstr "Egiaztatu ondo idatzita dagoela eta saiatu berriro."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:626
-#: ../src/nautilus-window-manage-views.c:1372
+#: libnautilus-private/nautilus-program-choosing.c:626
+#: src/nautilus-window-manage-views.c:1358
 #, c-format
 msgid "Couldn't find \"%s\"."
 msgstr "Ezin izan da \"%s\" aurkitu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:644
-#: ../src/nautilus-connect-server-dialog-main.c:72
-#: ../src/nautilus-window-manage-views.c:1448
+#: libnautilus-private/nautilus-program-choosing.c:644
+#: src/nautilus-connect-server-dialog-main.c:71
+#: src/nautilus-window-manage-views.c:1434
 msgid "Can't Display Location"
 msgstr "Ezin da Helbidea bistaratu"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:875
+#: libnautilus-private/nautilus-program-choosing.c:873
 msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "Ezin duzu urruneko gune batetik komandorik exekutatu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:877
+#: libnautilus-private/nautilus-program-choosing.c:875
 msgid "This is disabled due to security considerations."
 msgstr "Hau desgaituta dago, segurtasun-neurriak direla eta."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:878
+#: libnautilus-private/nautilus-program-choosing.c:876
 msgid "Can't Execute Remote Links"
 msgstr "Ezin da urruneko estekarik exekutatu"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:888
-#: ../libnautilus-private/nautilus-program-choosing.c:959
+#: libnautilus-private/nautilus-program-choosing.c:886
+#: libnautilus-private/nautilus-program-choosing.c:955
 msgid "Details: "
 msgstr "Xehetasunak: "
 
 #
-#: ../libnautilus-private/nautilus-program-choosing.c:892
-#: ../libnautilus-private/nautilus-program-choosing.c:963
+#: libnautilus-private/nautilus-program-choosing.c:890
+#: libnautilus-private/nautilus-program-choosing.c:959
 msgid "Error Launching Application"
 msgstr "Errorea aplikazioa abiaraztean"
 
 #
-#: ../libnautilus-private/nautilus-program-choosing.c:920
-#: ../libnautilus-private/nautilus-program-choosing.c:932
+#: libnautilus-private/nautilus-program-choosing.c:918
+#: libnautilus-private/nautilus-program-choosing.c:930
 msgid "This drop target only supports local files."
 msgstr "Honek jaregiteko helburuak fitxategi lokalak bakarrik onartzen ditu."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:921
+#: libnautilus-private/nautilus-program-choosing.c:919
 msgid ""
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
@@ -2675,12 +2983,12 @@ msgstr ""
 "berriro jaregin."
 
 #
-#: ../libnautilus-private/nautilus-program-choosing.c:923
-#: ../libnautilus-private/nautilus-program-choosing.c:935
+#: libnautilus-private/nautilus-program-choosing.c:921
+#: libnautilus-private/nautilus-program-choosing.c:933
 msgid "Drop Target Only Supports Local Files"
 msgstr "Jaregiteko helburuak fitxategi lokalak bakarrik onartzen ditu"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:933
+#: libnautilus-private/nautilus-program-choosing.c:931
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
@@ -2688,75 +2996,76 @@ msgstr ""
 "Lokalak ez diren fitxategiak irekitzeko, kopiatu karpeta lokal batera eta "
 "berriro jaregin. Zuk jarengidako fitxategi lokalak dagoeneko ireki dira."
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:174
+#: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Editatu"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:175
+#: libnautilus-private/nautilus-undo-signal-handlers.c:175
 msgid "Undo Edit"
 msgstr "Desegin edizioa"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:176
+#: libnautilus-private/nautilus-undo-signal-handlers.c:176
 msgid "Undo the edit"
 msgstr "Desegin edizioa"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:177
+#: libnautilus-private/nautilus-undo-signal-handlers.c:177
 msgid "Redo Edit"
 msgstr "Berregin edizioa"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:178
+#: libnautilus-private/nautilus-undo-signal-handlers.c:178
 msgid "Redo the edit"
 msgstr "Berregin edizioa"
 
-#: ../nautilus-computer.desktop.in.h:2
+#: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
 msgstr "Ikusi zure ordenagailuaren biltegia"
 
-#: ../nautilus-file-management-properties.desktop.in.h:1
+#: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
 msgstr "Aldatu fitxategiak kudeatzeko modua"
 
 #
-#: ../nautilus-file-management-properties.desktop.in.h:2
+#: nautilus-file-management-properties.desktop.in.h:2
 msgid "File Management"
 msgstr "Fitxategi-kudeaketa"
 
 #
-#: ../nautilus-home.desktop.in.h:1 ../src/file-manager/fm-tree-view.c:1243
+#: nautilus-home.desktop.in.h:1 src/file-manager/fm-tree-view.c:1252
 msgid "Home Folder"
 msgstr "Karpeta nagusia"
 
 #
-#: ../nautilus-home.desktop.in.h:2
+#: nautilus-home.desktop.in.h:2
 msgid "View your home folder in the Nautilus file manager"
 msgstr "Ikusi zure karpeta nagusia Nautilus fitxategi-kudeatzailean"
 
-#: ../nautilus.desktop.in.h:1
-msgid "Browse the file system with the file manager"
+#: nautilus.desktop.in.h:1
+msgid "Browse the filesystem with the file manager"
 msgstr "Arakatu fitxategi-sistema fitxategi-kudeatzailearekin"
 
 #
-#: ../nautilus.desktop.in.h:2
+#: nautilus.desktop.in.h:2
+#, fuzzy
 msgid "File Browser"
-msgstr "Fitxategi-arakatzailea"
+msgstr "Fitxategi arakatzailea: %s"
 
-#: ../src/Nautilus_shell.server.in.h:1
+#: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
 msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 
-#: ../src/Nautilus_shell.server.in.h:2
+#: src/Nautilus_shell.server.in.h:2
 msgid "Nautilus factory"
 msgstr "Nautilus-en fabrika"
 
-#: ../src/Nautilus_shell.server.in.h:3
+#: src/Nautilus_shell.server.in.h:3
 msgid "Nautilus metafile factory"
 msgstr "Nautilus-en metafitxategien fabrika"
 
-#: ../src/Nautilus_shell.server.in.h:4
+#: src/Nautilus_shell.server.in.h:4
 msgid "Nautilus shell"
 msgstr "Nautilus shell"
 
-#: ../src/Nautilus_shell.server.in.h:5
+#: src/Nautilus_shell.server.in.h:5
 msgid ""
 "Nautilus shell operations that can be done from subsequent command-line "
 "invocations"
@@ -2764,116 +3073,103 @@ msgstr ""
 "Komando-lerroko ondorengo deien bidez egin daitezkeen Nautilus-en shell "
 "eragiketak"
 
-#: ../src/Nautilus_shell.server.in.h:6
+#: src/Nautilus_shell.server.in.h:6
 msgid "Produces metafile objects for accessing Nautilus metadata"
 msgstr "Nautilus-en metadatuak atzitzeko metafitxategi-objektuak sortzen ditu"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:617
+#: src/file-manager/fm-desktop-icon-view.c:625
 msgid "Background"
 msgstr "Atzeko planoa"
 
-#. name, stock id
-#: ../src/file-manager/fm-desktop-icon-view.c:680
-#: ../src/file-manager/fm-directory-view.c:6154
-#: ../src/file-manager/fm-directory-view.c:6841
+#: src/file-manager/fm-desktop-icon-view.c:686
+#, fuzzy
 msgid "E_mpty Trash"
-msgstr "_Hustu zakarrontzia"
+msgstr "Hustu zakarrontzia"
 
 #
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:696
+msgid "Open T_erminal"
+msgstr "Ireki t_erminala"
+
 #. label, accelerator
+#: src/file-manager/fm-desktop-icon-view.c:697
+msgid "Open a new GNOME terminal window"
+msgstr "Ireki GNOME terminal-leiho berria"
+
+#
 #. name, stock id
-#: ../src/file-manager/fm-desktop-icon-view.c:692
-#: ../src/file-manager/fm-directory-view.c:6126
-msgid "Create L_auncher..."
-msgstr "Sortu a_biarazlea..."
+#: src/file-manager/fm-desktop-icon-view.c:700
+#: src/file-manager/fm-directory-view.c:5739
+msgid "Create L_auncher"
+msgstr "Sortu a_biarazlea"
 
 #
-#. tooltip
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:694
-#: ../src/file-manager/fm-directory-view.c:6127
+#: src/file-manager/fm-desktop-icon-view.c:701
+#: src/file-manager/fm-directory-view.c:5740
 msgid "Create a new launcher"
 msgstr "Sortu abiarazle berria"
 
 #
-#. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:699
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:704
 msgid "Change Desktop _Background"
 msgstr "Aldatu _mahaigainaren atzeko planoa"
 
-#. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:701
+#. label, accelerator
+#: src/file-manager/fm-desktop-icon-view.c:705
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Zure mahaigaineko atzeko planoaren eredua edo kolorea ezartzeko aukera "
 "ematen dizun leihoa erakusten du"
 
-#. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:706
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:708
 msgid "Empty Trash"
 msgstr "Hustu zakarrontzia"
 
-#. tooltip
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:708
-#: ../src/file-manager/fm-directory-view.c:6155
+#: src/file-manager/fm-desktop-icon-view.c:709
+#: src/file-manager/fm-directory-view.c:5768
 msgid "Delete all items in the Trash"
 msgstr "Ezabatu zakarrontziko elementu guztiak"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:797
-#: ../src/nautilus-desktop-window.c:246 ../src/nautilus-pathbar.c:1130
-#: ../src/nautilus-pathbar.c:1134 ../src/nautilus-places-sidebar.c:161
+#: src/file-manager/fm-desktop-icon-view.c:798
+#: src/nautilus-desktop-window.c:365
 msgid "Desktop"
 msgstr "Mahaigaina"
 
-#
-#: ../src/file-manager/fm-desktop-icon-view.c:798
-msgid "View as Desktop"
-msgstr "Ikusi mahaigain gisa"
-
-#
-#: ../src/file-manager/fm-desktop-icon-view.c:799
-msgid "View as _Desktop"
-msgstr "Ikusi _mahaigain gisa"
-
-#: ../src/file-manager/fm-desktop-icon-view.c:800
-msgid "The desktop view encountered an error."
-msgstr "Mahaigainaren ikuspegiak errorea aurkitu du."
-
-#: ../src/file-manager/fm-desktop-icon-view.c:801
-msgid "The desktop view encountered an error while starting up."
-msgstr "Mahaigainaren ikuspegiak errorea aurkitu du abiaraztean."
-
-#: ../src/file-manager/fm-desktop-icon-view.c:802
-msgid "Display this location with the desktop view."
-msgstr "Bistaratu helbidea mahaigaineko ikuspegiarekin."
+#: src/file-manager/fm-desktop-icon-view.c:799
+#, fuzzy
+msgid "_Desktop"
+msgstr "Mahaigaina"
 
-#: ../src/file-manager/fm-directory-view.c:547
+#: src/file-manager/fm-directory-view.c:510
 #, c-format
 msgid "Open %d Window?"
 msgid_plural "Open %d Windows?"
 msgstr[0] "%d leiho ireki?"
 msgstr[1] "%d leiho ireki?"
 
-#: ../src/file-manager/fm-directory-view.c:548
+#: src/file-manager/fm-directory-view.c:511
 msgid "Are you sure you want to open all files?"
 msgstr "Ziur zaude  fitxategi denak irekitzea nahi duzula?"
 
-#: ../src/file-manager/fm-directory-view.c:549
-#: ../src/nautilus-location-bar.c:158
+#: src/file-manager/fm-directory-view.c:512 src/nautilus-location-bar.c:158
 #, c-format
 msgid "This will open %d separate window."
 msgid_plural "This will open %d separate windows."
 msgstr[0] "Honek %d leiho irekiko ditu."
 msgstr[1] "Honek %d leiho irekiko ditu. Ziur zaude hori egin nahi duzula?"
 
-#: ../src/file-manager/fm-directory-view.c:857
+#: src/file-manager/fm-directory-view.c:813
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Ziur zaude \"%s\" behin betiko ezabatu nahi duzula?"
 
-#: ../src/file-manager/fm-directory-view.c:861
+#: src/file-manager/fm-directory-view.c:817
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
 msgid_plural ""
@@ -2881,36 +3177,36 @@ msgid_plural ""
 msgstr[0] "Ziur zaude hautatutako %d elementuak betiko ezabatu nahi dituzula?"
 msgstr[1] "Ziur zaude hautatutako %d elementuak betiko ezabatu nahi dituzula?"
 
-#: ../src/file-manager/fm-directory-view.c:869
+#: src/file-manager/fm-directory-view.c:825
 msgid "If you delete an item, it is permanently lost."
 msgstr "Hautatutako elementu guztiak behin betiko ezabatzen ditu."
 
-#: ../src/file-manager/fm-directory-view.c:870
+#: src/file-manager/fm-directory-view.c:826
 msgid "Delete?"
 msgstr "Ezabatu?"
 
 #
-#: ../src/file-manager/fm-directory-view.c:1022
+#: src/file-manager/fm-directory-view.c:977
 msgid "Select Pattern"
 msgstr "Hautatu eredua"
 
-#: ../src/file-manager/fm-directory-view.c:1038
+#: src/file-manager/fm-directory-view.c:993
 msgid "_Pattern:"
 msgstr "_Eredua:"
 
-#: ../src/file-manager/fm-directory-view.c:1865
+#: src/file-manager/fm-directory-view.c:1791
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" hautatuta"
 
-#: ../src/file-manager/fm-directory-view.c:1867
+#: src/file-manager/fm-directory-view.c:1793
 #, c-format
 msgid "%d folder selected"
 msgid_plural "%d folders selected"
 msgstr[0] "%d karpeta hautatuta"
 msgstr[1] "%d karpeta hautatuta"
 
-#: ../src/file-manager/fm-directory-view.c:1877
+#: src/file-manager/fm-directory-view.c:1803
 #, c-format
 msgid " (containing %d item)"
 msgid_plural " (containing %d items)"
@@ -2918,19 +3214,19 @@ msgstr[0] " (%d elementu ditu)"
 msgstr[1] " (%d elementu ditu)"
 
 #. translators: this is preceded with a string of form 'N folders' (N more than 1)
-#: ../src/file-manager/fm-directory-view.c:1888
+#: src/file-manager/fm-directory-view.c:1814
 #, c-format
 msgid " (containing a total of %d item)"
 msgid_plural " (containing a total of %d items)"
 msgstr[0] " (guztira %d elementu ditu)"
 msgstr[1] " (guztira %d elementu ditu)"
 
-#: ../src/file-manager/fm-directory-view.c:1904
+#: src/file-manager/fm-directory-view.c:1830
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" hautatuta (%s)"
 
-#: ../src/file-manager/fm-directory-view.c:1908
+#: src/file-manager/fm-directory-view.c:1834
 #, c-format
 msgid "%d item selected (%s)"
 msgid_plural "%d items selected (%s)"
@@ -2938,7 +3234,7 @@ msgstr[0] "%d elementu hautatuta (%s)"
 msgstr[1] "%d elementu hautatuta (%s)"
 
 #. Folders selected also, use "other" terminology
-#: ../src/file-manager/fm-directory-view.c:1916
+#: src/file-manager/fm-directory-view.c:1842
 #, c-format
 msgid "%d other item selected (%s)"
 msgid_plural "%d other items selected (%s)"
@@ -2946,7 +3242,7 @@ msgstr[0] "beste %d elementu hautatuta (%s)"
 msgstr[1] "beste %d elementu hautatuta (%s)"
 
 #
-#: ../src/file-manager/fm-directory-view.c:1937
+#: src/file-manager/fm-directory-view.c:1863
 #, c-format
 msgid "%s, Free space: %s"
 msgstr "%s, leku librea: %s"
@@ -2958,7 +3254,7 @@ msgstr "%s, leku librea: %s"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: ../src/file-manager/fm-directory-view.c:1962
+#: src/file-manager/fm-directory-view.c:1888
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -2967,59 +3263,50 @@ 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:2032
+#: src/file-manager/fm-directory-view.c:1958
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "\"%s\" karpetak Nautilus-ek maneia ditzakeenak baino fitxategi gehiago ditu."
 
-#: ../src/file-manager/fm-directory-view.c:2038
+#: src/file-manager/fm-directory-view.c:1964
 msgid "Some files will not be displayed."
 msgstr "Fitxategi batzuk ez dira bistaratuko."
 
-#: ../src/file-manager/fm-directory-view.c:2039
+#: src/file-manager/fm-directory-view.c:1965
 msgid "Too Many Files"
 msgstr "Fitxategi gehiegi"
 
-#: ../src/file-manager/fm-directory-view.c:3353
+#: src/file-manager/fm-directory-view.c:3113
 msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "Ezin da fitxategia zakarrontzira eraman. Berehala ezabatu nahi duzu?"
 
-#: ../src/file-manager/fm-directory-view.c:3354
+#: src/file-manager/fm-directory-view.c:3114
 #, c-format
 msgid "The file \"%s\" cannot be moved to the trash."
 msgstr "Ezin da \"%s\" fitxategia zakarrontzira eraman."
 
-#: ../src/file-manager/fm-directory-view.c:3358
+#: src/file-manager/fm-directory-view.c:3118
 msgid "Cannot move items to trash, do you want to delete them immediately?"
-msgstr "Ezin dira elementuak zakarrontzira bota. Berehala ezabatu nahi dituzu?"
-
-#: ../src/file-manager/fm-directory-view.c:3359
-#, c-format
-msgid "None of the %d selected items can be moved to the Trash"
-msgstr "Hautatutako %d elementuetatik bat ere ezin da zakarrontzira bota"
+msgstr ""
+"Ezin dira elementuak zakarrontzira eraman. Berehala ezabatu nahi dituzu?"
 
-#: ../src/file-manager/fm-directory-view.c:3361
+#: src/file-manager/fm-directory-view.c:3121
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 "Ezin dira elementu batzuk zakarrontzira eraman. Berehala ezabatu nahi dituzu?"
 
-#: ../src/file-manager/fm-directory-view.c:3362
-#, c-format
-msgid "%d of the selected items cannot be moved to the Trash"
-msgstr "Hautatutako elementuetatik %d ezin dira zakarrontzira bota"
-
-#: ../src/file-manager/fm-directory-view.c:3368
+#: src/file-manager/fm-directory-view.c:3128
 msgid "Delete Immediately?"
 msgstr "Berehala ezabatu?"
 
-#: ../src/file-manager/fm-directory-view.c:3400
+#: src/file-manager/fm-directory-view.c:3160
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Ziur zaude \"%s\" zakarrontzitik behin betiko ezabatu nahi duzula?"
 
-#: ../src/file-manager/fm-directory-view.c:3404
+#: src/file-manager/fm-directory-view.c:3164
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected item from the "
@@ -3034,59 +3321,59 @@ msgstr[1] ""
 "Ziur zaude hautatutako %d elementuak zakarrontzitik betiko ezabatu nahi "
 "dituzula?"
 
-#: ../src/file-manager/fm-directory-view.c:3413
+#: src/file-manager/fm-directory-view.c:3173
 msgid "If you delete an item, it will be permanently lost."
 msgstr "Elementu bat ezabatzen baduzu, betirako galduko duzu."
 
-#: ../src/file-manager/fm-directory-view.c:3414
+#: src/file-manager/fm-directory-view.c:3174
 msgid "Delete From Trash?"
 msgstr "Zakarrontzitik ezabatu?"
 
-#: ../src/file-manager/fm-directory-view.c:3951
-#, c-format
+#: src/file-manager/fm-directory-view.c:3658
+#, fuzzy, c-format
 msgid "Open with \"%s\""
 msgstr "Ireki honekin: %s"
 
-#: ../src/file-manager/fm-directory-view.c:3952
+#: src/file-manager/fm-directory-view.c:3659
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Erabili \"%s\" hautatutako elementua irekitzeko"
 
-#: ../src/file-manager/fm-directory-view.c:4041
+#: src/file-manager/fm-directory-view.c:3748
 #, c-format
 msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "\"%s\" exekutatu egin nahi duzu edo haren edukia bistaratu?"
 
-#: ../src/file-manager/fm-directory-view.c:4043
+#: src/file-manager/fm-directory-view.c:3750
 #, c-format
 msgid "\"%s\" is an executable text file."
 msgstr "\"%s\" testu-fitxategi exekutagarria da."
 
-#: ../src/file-manager/fm-directory-view.c:4049
+#: src/file-manager/fm-directory-view.c:3756
 msgid "Run or Display?"
 msgstr "Exekutatu edo bistaratu?"
 
 #
-#: ../src/file-manager/fm-directory-view.c:4050
+#: src/file-manager/fm-directory-view.c:3757
 msgid "Run in _Terminal"
 msgstr "Exekutatu _terminalean"
 
 #
-#: ../src/file-manager/fm-directory-view.c:4051
+#: src/file-manager/fm-directory-view.c:3758
 msgid "_Display"
 msgstr "_Bistaratu"
 
 #
-#: ../src/file-manager/fm-directory-view.c:4054
+#: src/file-manager/fm-directory-view.c:3761
 msgid "_Run"
 msgstr "_Exekutatu"
 
-#: ../src/file-manager/fm-directory-view.c:4440
+#: src/file-manager/fm-directory-view.c:4147
 #, c-format
 msgid "Cannot open %s"
 msgstr "Ezin da %s ireki"
 
-#: ../src/file-manager/fm-directory-view.c:4443
+#: src/file-manager/fm-directory-view.c:4150
 #, c-format
 msgid ""
 "The filename \"%s\" indicates that this file is of type \"%s\". The contents "
@@ -3108,23 +3395,23 @@ msgstr ""
 "ri dagokionera, eta gero ireki fitxategia beti bezala. Bestela, \"Ireki "
 "honekin\" menua erabiliz fitxategiarentzako aplikazio zehatza aukeratzeko."
 
-#: ../src/file-manager/fm-directory-view.c:4830
+#: src/file-manager/fm-directory-view.c:4571
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Exekutatu \"%s\" hautatutako elementuetan"
 
-#: ../src/file-manager/fm-directory-view.c:5079
+#: src/file-manager/fm-directory-view.c:4820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Sortu dokumentua \"%s\" txantiloitik"
 
-#: ../src/file-manager/fm-directory-view.c:5285
+#: src/file-manager/fm-directory-view.c:5026
 msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr ""
 "Karpeta honetako fitxategi exekutagarri guztiak agertuko dira Script-en "
 "menuan. "
 
-#: ../src/file-manager/fm-directory-view.c:5287
+#: src/file-manager/fm-directory-view.c:5028
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
@@ -3132,11 +3419,11 @@ msgstr ""
 "Menuko script bat aukeratzen baduzu, script hori exekutatuko da hautatutako "
 "edozein elementu sarrera moduan erabilita."
 
-#: ../src/file-manager/fm-directory-view.c:5289
+#: src/file-manager/fm-directory-view.c:5030
 msgid "About Scripts"
 msgstr "Script-ei buruz"
 
-#: ../src/file-manager/fm-directory-view.c:5290
+#: src/file-manager/fm-directory-view.c:5031
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -3178,303 +3465,337 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: uneko leihoaren kokalekua eta tamaina"
 
-#: ../src/file-manager/fm-directory-view.c:5451
-#: ../src/file-manager/fm-tree-view.c:900
+#: src/file-manager/fm-directory-view.c:5194
+#: src/file-manager/fm-tree-view.c:895
 #, c-format
-msgid "\"%s\" will be moved if you select the Paste command"
-msgstr "\"%s\" lekuz aldatuko da 'Itsatsi' komandoa hautatzen baduzu"
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+"'Itsatsi fitxategiak' komandoa hautatzen baduzu, \"%s\" lekuz aldatuko da"
 
-#: ../src/file-manager/fm-directory-view.c:5455
-#: ../src/file-manager/fm-tree-view.c:904
+#: src/file-manager/fm-directory-view.c:5198
+#: src/file-manager/fm-tree-view.c:899
 #, c-format
-msgid "\"%s\" will be copied if you select the Paste command"
-msgstr "\"%s\" kopiatu egingo da 'Itsatsi' komandoa hautatzen baduzu"
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+"'Itsatsi fitxategiak' komandoa hautatzen baduzu, \"%s\" kopiatu egingo da"
 
-#: ../src/file-manager/fm-directory-view.c:5462
+#: src/file-manager/fm-directory-view.c:5205
 #, c-format
-msgid "The %d selected item will be moved if you select the Paste command"
+msgid ""
+"The %d selected item will be moved if you select the Paste Files command"
 msgid_plural ""
-"The %d selected items will be moved if you select the Paste command"
-msgstr[0] "Hautatutako elementua (%d) lekuz aldatuko da 'Itsatsi' komandoa hautatzen baduzu"
-msgstr[1] "Hautatutako %d elementuak lekuz aldatuko dira 'Itsatsi' komandoa hautatzen baduzu"
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr[0] ""
+"'Itsatsi fitxategiak' komandoa hautatzen baduzu, hautatutako %d elementuak "
+"lekuz aldatuko dira"
+msgstr[1] ""
+"'Itsatsi fitxategiak' komandoa hautatzen baduzu, hautatutako %d elementuak "
+"lekuz aldatuko dira"
 
-#: ../src/file-manager/fm-directory-view.c:5469
+#: src/file-manager/fm-directory-view.c:5212
 #, c-format
-msgid "The %d selected item will be copied if you select the Paste command"
+msgid ""
+"The %d selected item will be copied if you select the Paste Files command"
 msgid_plural ""
-"The %d selected items will be copied if you select the Paste command"
-msgstr[0] "Hautatutako elementua (%d) kopiatu egingo da 'Itsatsi' komandoa hautatzen baduzu"
-msgstr[1] "Hautatutako %d elementuak kopiatu egingo dira 'Itsatsi' komandoa hautatzen baduzu"
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr[0] ""
+"'Itsatsi fitxategiak' komandoa hautatzen baduzu, hautatutako %d elementuak "
+"kopiatu egingo dira"
+msgstr[1] ""
+"'Itsatsi fitxategiak' komandoa hautatzen baduzu, hautatutako %d elementuak "
+"kopiatu egingo dira"
 
-#: ../src/file-manager/fm-directory-view.c:5563
-#: ../src/file-manager/fm-tree-view.c:981
+#: src/file-manager/fm-directory-view.c:5293
+#: src/file-manager/fm-tree-view.c:975
 msgid "There is nothing on the clipboard to paste."
 msgstr "Arbelean ez dago itsasteko ezer."
 
-#: ../src/file-manager/fm-directory-view.c:5689
-#: ../src/file-manager/fm-directory-view.c:7330
+#: src/file-manager/fm-directory-view.c:5400
+#: src/file-manager/fm-directory-view.c:6783
 msgid "Mount Error"
 msgstr "Errorea muntatzean"
 
-#: ../src/file-manager/fm-directory-view.c:5746
-#: ../src/file-manager/fm-tree-view.c:1066
+#: src/file-manager/fm-directory-view.c:5457
+#: src/file-manager/fm-tree-view.c:1060
 msgid "Unmount Error"
 msgstr "Errorea desmuntatzean"
 
-#: ../src/file-manager/fm-directory-view.c:5759
-#: ../src/file-manager/fm-tree-view.c:1063
+#: src/file-manager/fm-directory-view.c:5470
+#: src/file-manager/fm-tree-view.c:1057
 msgid "Eject Error"
 msgstr "Errorea egoztean"
 
 #
-#: ../src/file-manager/fm-directory-view.c:5908
-#, c-format
+#: src/file-manager/fm-directory-view.c:5619
+#, fuzzy, c-format
 msgid "Connect to Server %s"
-msgstr "Konektatu %s zerbitzarira"
+msgstr "Konektatu zerbitzarira"
 
 #
-#: ../src/file-manager/fm-directory-view.c:5913
+#: src/file-manager/fm-directory-view.c:5624
+#, fuzzy
 msgid "_Connect"
 msgstr "_Konektatu"
 
 #
-#: ../src/file-manager/fm-directory-view.c:5927
+#: src/file-manager/fm-directory-view.c:5638
 msgid "Link _name:"
 msgstr "Estekaren _izena:"
 
 #
-#: ../src/file-manager/fm-directory-view.c:6100
+#: src/file-manager/fm-directory-view.c:5716
 msgid "Create _Document"
 msgstr "Sortu _dokumentua"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6101
+#: src/file-manager/fm-directory-view.c:5717
 msgid "Open Wit_h"
 msgstr "I_reki honekin"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6102
+#: src/file-manager/fm-directory-view.c:5718
 msgid "Choose a program with which to open the selected item"
 msgstr "Aukeratu programa bat hautatutako elementua irekitzeko"
 
 #
+#: src/file-manager/fm-directory-view.c:5719
+msgid "_Scripts"
+msgstr "_Script-ak"
+
+#. name, stock id, label
+#: src/file-manager/fm-directory-view.c:5720
+#, fuzzy
+msgid "Run or manage scripts from ~/.gnome2/nautilus-scripts"
+msgstr "Exekutatu edo kudeatu script-ak ~/Nautilus/scripts-etik"
+
+#
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6104
-#: ../src/file-manager/fm-directory-view.c:6112
+#: src/file-manager/fm-directory-view.c:5722
 msgid "_Properties"
 msgstr "_Propietateak"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6105
+#: src/file-manager/fm-directory-view.c:5723
 msgid "View or modify the properties of each selected item"
 msgstr "Hautatutako elementuen propietateak erakutsi edo aldatzen ditu"
 
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6113
-msgid "View or modify the properties of the open folder"
-msgstr "Ikusi edo aldatu irekitako karpetaren propietateak"
-
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6116
+#: src/file-manager/fm-directory-view.c:5730
 msgid "Create _Folder"
 msgstr "Sortu _karpeta"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6117
+#: src/file-manager/fm-directory-view.c:5731
 msgid "Create a new empty folder inside this folder"
 msgstr "Sortu karpeta huts berria karpeta honen barruan"
 
-#: ../src/file-manager/fm-directory-view.c:6119
+#: src/file-manager/fm-directory-view.c:5733
 msgid "No templates Installed"
 msgstr "Ez daude txantiloirik instalatuta"
 
 #. name, stock id, label
 #. name, stock id
-#. translators: this is used to indicate that a file doesn't contain anything
-#: ../src/file-manager/fm-directory-view.c:6122
+#: src/file-manager/fm-directory-view.c:5735
 msgid "_Empty File"
 msgstr "Fitxategi _hutsa"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6123
+#: src/file-manager/fm-directory-view.c:5736
 msgid "Create a new empty file inside this folder"
 msgstr "Sortu fitxategi huts berria karpeta honen barruan"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6130
-#: ../src/file-manager/fm-directory-view.c:6742
-#: ../src/file-manager/fm-tree-view.c:1105
+#: src/file-manager/fm-directory-view.c:5743
+#: src/file-manager/fm-directory-view.c:6220
 msgid "_Open"
 msgstr "_Ireki"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6131
+#: src/file-manager/fm-directory-view.c:5744
 msgid "Open the selected item in this window"
 msgstr "Ireki hautatutako elementua leiho honetan"
 
 #. name, stock id
-#. Location-specific actions
-#. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6138
-#: ../src/file-manager/fm-directory-view.c:6234
+#: src/file-manager/fm-directory-view.c:5751
 msgid "Open in Navigation Window"
 msgstr "Ireki nabigazio leiho"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6139
+#: src/file-manager/fm-directory-view.c:5752
 msgid "Open each selected item in a navigation window"
 msgstr "Ireki hautatutako elementu bakoitza nabigazio leiho batean"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6142
-#: ../src/file-manager/fm-directory-view.c:6146
+#: src/file-manager/fm-directory-view.c:5755
+#: src/file-manager/fm-directory-view.c:5759
+#, fuzzy
 msgid "Open with Other _Application..."
-msgstr "Ireki beste _aplikazio batekin..."
+msgstr "Ireki beste aplikazio batekin"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6143
-#: ../src/file-manager/fm-directory-view.c:6147
+#: src/file-manager/fm-directory-view.c:5756
+#: src/file-manager/fm-directory-view.c:5760
 msgid "Choose another application with which to open the selected item"
 msgstr "Aukeratu beste aplikazio bat hautatutako elementua irekitzeko"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6150
+#: src/file-manager/fm-directory-view.c:5763
 msgid "_Open Scripts Folder"
 msgstr "I_reki script-en karpeta"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6151
+#: src/file-manager/fm-directory-view.c:5764
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Menu honetan agertzen diren script-ak dituen karpeta erakusten du"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5771
+#: src/file-manager/fm-directory-view.c:6328
+msgid "Cu_t Files"
+msgstr "Eb_aki fitxategiak"
+
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6159
-msgid "Prepare the selected files to be moved with a Paste command"
-msgstr "Hautatutako fitxategiak 'Itsatsi' komandoaren bidez lekuz aldatzeko prestatzen ditu"
+#: src/file-manager/fm-directory-view.c:5772
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+"Hautatutako fitxategiak 'Itsatsi fitxategiak' komandoaren bidez lekuz "
+"aldatzeko prestatzen ditu"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5775
+#: src/file-manager/fm-directory-view.c:6337
+msgid "_Copy Files"
+msgstr "_Kopiatu fitxategiak"
+
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6163
-msgid "Prepare the selected files to be copied with a Paste command"
-msgstr "Hautatutako fitxategiak 'Itsatsi' komandoaren bidez kopiatzeko prestatzen ditu"
+#: src/file-manager/fm-directory-view.c:5776
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+"Hautatutako fitxategiak 'Itsatsi fitxategiak' komandoaren bidez kopiatzeko "
+"prestatzen ditu"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5779
+msgid "_Paste Files"
+msgstr "Itsatsi _fitxategiak"
+
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6167
-msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Aurrez hautatutako fitxategiak 'Ebaki' edo 'Kopiatu' komandoen bidez lekuz aldatu edo kopiatu ditu"
+#: src/file-manager/fm-directory-view.c:5780
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+"'Ebaki fitxategiak' edo 'Kopiatu fitxategiak' komandoen bidez hautatutako "
+"fitxategiak lekuz aldatu edo kopiatu"
 
 #
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6172
-#: ../src/file-manager/fm-tree-view.c:1163
-msgid "_Paste Into Folder"
-msgstr "I_tsatsi karpetan"
+#: src/file-manager/fm-directory-view.c:5785
+msgid "_Paste Files Into Folder"
+msgstr "I_tsatsi fitxategiak karpetan"
 
 #
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6173
+#: src/file-manager/fm-directory-view.c:5786
 msgid ""
-"Move or copy files previously selected by a Cut or Copy command into the "
-"selected folder"
+"Move or copy files previously selected by a Cut Files or Copy Files command "
+"into the selected folder"
 msgstr ""
-"Aurrez hautatutako fitxategiak 'Ebaki' edo 'Kopiatu' komandoen bidez lekuz aldatu "
-"edo kopiatu ditu hautatutako karpetan"
+"'Ebaki fitxategiak' edo 'Kopiatu fitxategiak' komandoen bidez hautatutako "
+"fitxategiak lekuz aldatu edo kopiatu hautatutako karpetan"
+
+#. name, stock id
+#: src/file-manager/fm-directory-view.c:5789
+msgid "Select _All Files"
+msgstr "_Hautatu fitxategi guztiak"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6177
+#: src/file-manager/fm-directory-view.c:5790
 msgid "Select all items in this window"
 msgstr "Hautatu leiho honetako elementu guztiak"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6180
+#: src/file-manager/fm-directory-view.c:5793
 msgid "Select _Pattern"
 msgstr "Hauatu _eredua"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6181
+#: src/file-manager/fm-directory-view.c:5794
 msgid "Select items in this window matching a given pattern"
 msgstr "Hautatu emandako ereduarekin bat datozen leiho honetako elementuak"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6184
+#: src/file-manager/fm-directory-view.c:5797
 msgid "D_uplicate"
 msgstr "Bikoizt_u"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6185
+#: src/file-manager/fm-directory-view.c:5798
 msgid "Duplicate each selected item"
 msgstr "Hautatutako elementu guztiak bikoizten ditu"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6188
-#: ../src/file-manager/fm-directory-view.c:6815
+#: src/file-manager/fm-directory-view.c:5801
+#: src/file-manager/fm-directory-view.c:6297
 msgid "Ma_ke Link"
-msgid_plural "Ma_ke Links"
-msgstr[0] "_Sortu esteka"
-msgstr[1] "_Sortu estekak"
+msgstr "_Sortu esteka"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6189
+#: src/file-manager/fm-directory-view.c:5802
 msgid "Create a symbolic link for each selected item"
 msgstr "Sortu esteka sinboliko bat hautatutako elementu bakoitzerako"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6192
+#: src/file-manager/fm-directory-view.c:5805
 msgid "_Rename..."
 msgstr "I_zena aldatu..."
 
 #
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6193
+#: src/file-manager/fm-directory-view.c:5806
 msgid "Rename selected item"
 msgstr "Izena aldatu hautatutako elementuari"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6200
-#: ../src/file-manager/fm-directory-view.c:6248
-#: ../src/file-manager/fm-directory-view.c:6616
-#: ../src/file-manager/fm-directory-view.c:6783
-#: ../src/file-manager/fm-directory-view.c:7128
+#: src/file-manager/fm-directory-view.c:5809
+#: src/file-manager/fm-directory-view.c:6263
+#: src/file-manager/fm-directory-view.c:6581
 msgid "Mo_ve to Trash"
 msgstr "_Bota zakarrontzira"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6201
-#: ../src/file-manager/fm-directory-view.c:6784
+#: src/file-manager/fm-directory-view.c:5810
+#: src/file-manager/fm-directory-view.c:6264
 msgid "Move each selected item to the Trash"
 msgstr "Hautatutako elementu guztiak zakarrontzira botatzen ditu"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6204
-#: ../src/file-manager/fm-directory-view.c:6252
-#: ../src/file-manager/fm-directory-view.c:6802
+#: src/file-manager/fm-directory-view.c:5813
+#: src/file-manager/fm-directory-view.c:6282
 msgid "_Delete"
 msgstr "E_zabatu"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6205
+#: src/file-manager/fm-directory-view.c:5814
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Ezabatu hautatutako elementu bakoitza zakarrontzira bota gabe"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6208
+#: src/file-manager/fm-directory-view.c:5817
 msgid "Reset View to _Defaults"
 msgstr "Berrezarri ikuspegia _lehenetsietan"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6209
+#: src/file-manager/fm-directory-view.c:5818
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Ordenatzeko modua eta zoom-maila berrezartzen du ikuspegi honen hobespenekin "
@@ -3482,270 +3803,241 @@ msgstr ""
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6212
+#: src/file-manager/fm-directory-view.c:5821
+#, fuzzy
 msgid "Connect To This Server"
 msgstr "Konektatu zerbitzarira"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6213
+#: src/file-manager/fm-directory-view.c:5822
 msgid "Make a permanent connection to this server"
-msgstr "Egin konexio finkoa zerbitzarira"
+msgstr ""
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6216
+#: src/file-manager/fm-directory-view.c:5825
 msgid "_Mount Volume"
 msgstr "_Muntatu bolumena"
 
 #
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6217
+#: src/file-manager/fm-directory-view.c:5826
 msgid "Mount the selected volume"
 msgstr "Muntatu hautatutako bolumena"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6220
-#: ../src/file-manager/fm-tree-view.c:750
+#: src/file-manager/fm-directory-view.c:5829
+#: src/file-manager/fm-tree-view.c:745
 msgid "_Unmount Volume"
 msgstr "_Desmuntatu bolumena"
 
 #
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6221
+#: src/file-manager/fm-directory-view.c:5830
 msgid "Unmount the selected volume"
 msgstr "Desmuntatu hautatutako bolumena"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6224
+#: src/file-manager/fm-directory-view.c:5833
+#, fuzzy
 msgid "_Eject"
 msgstr "E_gotzi"
 
 #
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6225
+#: src/file-manager/fm-directory-view.c:5834
+#, fuzzy
 msgid "Eject the selected volume"
-msgstr "Egotzi hautatutako bolumena"
+msgstr "Babestu hautatutako bolumena"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6228
+#: src/file-manager/fm-directory-view.c:5837
+#, fuzzy
 msgid "Open File and Close window"
-msgstr "Ireki fitxategia eta itxi leihoa"
-
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6235
-msgid "Open this folder in a navigation window"
-msgstr "Ireki karpeta nabigazio leihoan"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6240
-msgid "Prepare this folder to be moved with a Paste command"
-msgstr "Karpeta prestatzen du  'Itsatsi' komandoaren bidez lekuz aldatzeko"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6244
-msgid "Prepare this folder to be copied with a Paste command"
-msgstr "Karpeta prestatzen du 'Itsatsi' komandoaren bidez kopiatzeko"
-
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6249
-msgid "Move this folder to the Trash"
-msgstr "Bota karpeta zakarrontzira"
-
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6253
-msgid "Delete this folder, without moving to the Trash"
-msgstr "Ezabatu karpeta, zakarrontzira bota gabe"
+msgstr "Ireki leiho berrian"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6259
+#: src/file-manager/fm-directory-view.c:5844
+#, fuzzy
 msgid "Show _Hidden Files"
-msgstr "Erakutsi ezkutuko _fitxategiak"
+msgstr "Erakutsi ezkutuko _fitxategiak eta babeskopia-fitxategiak"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6260
-msgid "Toggle the display of hidden files in the current window"
-msgstr "Txandakatu fitxategi ezkutuak bistaratzea uneko leihoan"
-
-#. Translators: %s is a directory
-#: ../src/file-manager/fm-directory-view.c:6309
-#, c-format
-msgid "Run or manage scripts from %s"
-msgstr "Exekutatu edo kudeatu %s direktorioko script-ak"
+#: src/file-manager/fm-directory-view.c:5845
+msgid "Toggles the display of hidden files in the current window"
+msgstr ""
 
-#
-#. Create a script action here specially because its tooltip is dynamic
-#: ../src/file-manager/fm-directory-view.c:6311
-msgid "_Scripts"
-msgstr "_Script-ak"
+#: src/file-manager/fm-directory-view.c:6209
+#, fuzzy, c-format
+msgid "_Open with \"%s\""
+msgstr "Ireki honekin: %s"
 
 #. add the "open in new window" menu item
-#: ../src/file-manager/fm-directory-view.c:6585
-#: ../src/file-manager/fm-directory-view.c:6751
-#: ../src/file-manager/fm-tree-view.c:1116
+#: src/file-manager/fm-directory-view.c:6229
+#: src/file-manager/fm-directory-view.c:6231
+#: src/file-manager/fm-tree-view.c:1110
+#, c-format
 msgid "Open in New Window"
-msgstr "Ireki leiho berrian"
+msgid_plural "Open in %d New Windows"
+msgstr[0] "Ireki leiho berrian"
+msgstr[1] "Ireki _leiho berrian"
 
 #
-#: ../src/file-manager/fm-directory-view.c:6587
-#: ../src/file-manager/fm-directory-view.c:6759
+#: src/file-manager/fm-directory-view.c:6238
+#, fuzzy
 msgid "_Browse Folder"
-msgid_plural "_Browse Folders"
-msgstr[0] "_Arakatu karpeta"
-msgstr[1] "_Arakatu karpetak"
+msgstr "Arakatu karpeta"
+
+#
+#: src/file-manager/fm-directory-view.c:6240
+#, fuzzy
+msgid "_Browse Folders"
+msgstr "Arakatu karpetak"
 
 #
-#: ../src/file-manager/fm-directory-view.c:6612
-#: ../src/file-manager/fm-directory-view.c:6779
+#: src/file-manager/fm-directory-view.c:6259
 msgid "_Delete from Trash"
 msgstr "_Ezabatu zakarrontzitik"
 
-#: ../src/file-manager/fm-directory-view.c:6613
-msgid "Delete the open folder permanently"
-msgstr "Ezabatu irekitako karpeta behin betiko"
+#: src/file-manager/fm-directory-view.c:6260
+msgid "Delete all selected items permanently"
+msgstr "Hautatutako elementu guztiak behin betiko ezabatzen ditu"
 
-#: ../src/file-manager/fm-directory-view.c:6617
-msgid "Move the open folder to the Trash"
-msgstr "Bota irekitako karpeta zakarrontzira"
+#
+#: src/file-manager/fm-directory-view.c:6296
+msgid "Ma_ke Links"
+msgstr "_Sortu estekak"
 
-#: ../src/file-manager/fm-directory-view.c:6731
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Ireki honekin: %s"
+#: src/file-manager/fm-directory-view.c:6327
+msgid "Cu_t File"
+msgstr "Eb_aki fitxategia"
 
-#: ../src/file-manager/fm-directory-view.c:6753
-#, c-format
-msgid "Open in %d New Window"
-msgid_plural "Open in %d New Windows"
-msgstr[0] "Ireki leiho berri %dean"
-msgstr[1] "Ireki %d leiho berritan"
-
-#: ../src/file-manager/fm-directory-view.c:6780
-msgid "Delete all selected items permanently"
-msgstr "Hautatutako elementu guztiak behin betiko ezabatzen ditu"
+#: src/file-manager/fm-directory-view.c:6336
+msgid "_Copy File"
+msgstr "_Kopiatu fitxategia"
 
 #
-#: ../src/file-manager/fm-directory-view.c:7119
+#: src/file-manager/fm-directory-view.c:6572
 msgid "The link is broken, do you want to move it to the Trash?"
 msgstr "Esteka hori hondatua dago. Zakarrontzira bota nahi duzu?"
 
 #
-#: ../src/file-manager/fm-directory-view.c:7121
+#: src/file-manager/fm-directory-view.c:6574
 msgid "This link can't be used, because it has no target."
 msgstr "Esteka hori ezin da erabili, helbururik ez duelako."
 
-#: ../src/file-manager/fm-directory-view.c:7123
+#: src/file-manager/fm-directory-view.c:6576
 #, c-format
 msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr "Esteka hori ezin da erabili, bere \"%s\" helburua ez dagoelako."
 
-#: ../src/file-manager/fm-directory-view.c:7128
+#: src/file-manager/fm-directory-view.c:6581
 msgid "Broken Link"
 msgstr "Esteka hautsita"
 
-#: ../src/file-manager/fm-directory-view.c:7448
+#: src/file-manager/fm-directory-view.c:6901
 #, c-format
 msgid "Opening \"%s\"."
 msgstr "\"%s\" irekitzen."
 
-#: ../src/file-manager/fm-directory-view.c:7455
+#: src/file-manager/fm-directory-view.c:6908
 msgid "Cancel Open?"
 msgstr "Irekitzea bertan behera utzi?"
 
-#: ../src/file-manager/fm-directory-view.c:8341
+#: src/file-manager/fm-directory-view.c:7784
+#, fuzzy
 msgid "Download location?"
-msgstr "Deskargatu helbidea?"
+msgstr "%d helbide ikusi nahi dituzu?"
 
-#: ../src/file-manager/fm-directory-view.c:8344
+#: src/file-manager/fm-directory-view.c:7787
+#, fuzzy
 msgid "You can download it or make a link to it."
-msgstr "Deskarga edo esteka bat sor dezakezu."
+msgstr "Karpeta bat ezin da karpeta beraren barrura eraman."
 
-#: ../src/file-manager/fm-directory-view.c:8347
+#: src/file-manager/fm-directory-view.c:7790
+#, fuzzy
 msgid "Make a _Link"
-msgstr "Sortu _esteka"
+msgstr "Sortu _Esteka"
 
 #
-#: ../src/file-manager/fm-directory-view.c:8351
+#: src/file-manager/fm-directory-view.c:7794
+#, fuzzy
 msgid "_Download"
-msgstr "_Deskargatu"
+msgstr "_Berritu"
 
-#: ../src/file-manager/fm-directory-view.c:8410
-#: ../src/file-manager/fm-directory-view.c:8463
-#: ../src/file-manager/fm-directory-view.c:8561
+#: src/file-manager/fm-directory-view.c:7851
+#: src/file-manager/fm-directory-view.c:7873
+#: src/file-manager/fm-directory-view.c:7987
 msgid "Drag and drop is not supported."
 msgstr "Arrastatu eta jaregitea ez dago onartuta."
 
-#: ../src/file-manager/fm-directory-view.c:8411
+#: src/file-manager/fm-directory-view.c:7852
 msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 "Arrastatu eta jaregitea fitxategi-sistema lokalekin bakarrik egin daiteke."
 
-#: ../src/file-manager/fm-directory-view.c:8412
-#: ../src/file-manager/fm-directory-view.c:8465
-#: ../src/file-manager/fm-directory-view.c:8563
+#: src/file-manager/fm-directory-view.c:7853
+#: src/file-manager/fm-directory-view.c:7875
+#: src/file-manager/fm-directory-view.c:7989
 msgid "Drag and Drop Error"
 msgstr "Errorea arrastatu eta jaregitean"
 
-#: ../src/file-manager/fm-directory-view.c:8464
-#: ../src/file-manager/fm-directory-view.c:8562
+#: src/file-manager/fm-directory-view.c:7874
+#: src/file-manager/fm-directory-view.c:7988
 msgid "An invalid drag type was used."
 msgstr "Arrastatze-mota baliogabea erabili da."
 
-#: ../src/file-manager/fm-ditem-page.c:337
-#: ../src/file-manager/fm-ditem-page.c:348
+#: src/file-manager/fm-ditem-page.c:337 src/file-manager/fm-ditem-page.c:348
 msgid "Comment"
 msgstr "Iruzkina"
 
-#: ../src/file-manager/fm-ditem-page.c:340
+#: src/file-manager/fm-ditem-page.c:340
 msgid "URL"
-msgstr "URLa"
-
-#: ../src/file-manager/fm-ditem-page.c:343
-#: ../src/file-manager/fm-ditem-page.c:354
-msgid "Description"
-msgstr "Azalpena"
+msgstr ""
 
-#: ../src/file-manager/fm-ditem-page.c:344
+#: src/file-manager/fm-ditem-page.c:344
+#, fuzzy
 msgid "Link"
-msgstr "Esteka"
+msgstr "esteka"
 
-#: ../src/file-manager/fm-ditem-page.c:351
+#: src/file-manager/fm-ditem-page.c:351
+#, fuzzy
 msgid "Command"
-msgstr "Komandoa"
+msgstr "Iruzkina"
 
 #
-#: ../src/file-manager/fm-ditem-page.c:355
+#: src/file-manager/fm-ditem-page.c:355
+#, fuzzy
 msgid "Launcher"
-msgstr "Abiarazlea"
+msgstr "Berrien panela"
 
-#: ../src/file-manager/fm-error-reporting.c:57
+#: src/file-manager/fm-error-reporting.c:57
 #, c-format
 msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Ez duzu behar adinako baimenik \"%s\"(r)en edukia ikusteko."
 
-#: ../src/file-manager/fm-error-reporting.c:61
+#: src/file-manager/fm-error-reporting.c:61
 #, c-format
 msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
 msgstr "Ezin izan da \"%s\" aurkitu. Baliteke duela gutxi ezabatu izana."
 
-#: ../src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:68
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Ezin izan da \"%s\"(r)en eduki osoa bistaratu."
 
-#: ../src/file-manager/fm-error-reporting.c:71
+#: src/file-manager/fm-error-reporting.c:71
 msgid "The folder contents could not be displayed."
 msgstr "Ezin izan dira karpetako edukiak bistaratu."
 
-#: ../src/file-manager/fm-error-reporting.c:72
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Errorea karpeta bistaratzean"
 
-#: ../src/file-manager/fm-error-reporting.c:103
+#: 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."
@@ -3753,19 +4045,19 @@ msgstr ""
 "Karpeta honetan lehendik ere badago \"%s\" izeneko bat. Erabili beste izen "
 "bat."
 
-#: ../src/file-manager/fm-error-reporting.c:108
+#: 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 ""
 "Karpeta honetan ez dago \"%s\"(r)ik. Lekuz aldatu edo ezabatu egin duzu?"
 
-#: ../src/file-manager/fm-error-reporting.c:113
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Ez duzu behar adina baimenik \"%s\"(r)i izena aldatzeko."
 
-#: ../src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -3774,78 +4066,78 @@ msgstr ""
 "\"%s\"izena ez da baliozkoa, \"/\" karakterea duelako. Erabili beste izen "
 "bat."
 
-#: ../src/file-manager/fm-error-reporting.c:122
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\"izena ez da baliozkoa. Erabili beste izen bat."
 
-#: ../src/file-manager/fm-error-reporting.c:128
+#: 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 ""
 "Ezin izan da \"%s\"(r)en izena aldatu, irakurtzeko soilik den disko batean "
 "dagoelako"
 
-#: ../src/file-manager/fm-error-reporting.c:137
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Ezin izan da \"%s\" izenaren ordez \"%s\" ipini."
 
-#: ../src/file-manager/fm-error-reporting.c:144
+#: src/file-manager/fm-error-reporting.c:144
 msgid "The item could not be renamed."
 msgstr "Ezin izan da elementua berrizendatu."
 
-#: ../src/file-manager/fm-error-reporting.c:145
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Errorea izena aldatzean"
 
-#: ../src/file-manager/fm-error-reporting.c:165
+#: src/file-manager/fm-error-reporting.c:165
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Ez duzu behar adinako baimenik \"%s\"(r)en taldea aldatzeko."
 
-#: ../src/file-manager/fm-error-reporting.c:169
+#: src/file-manager/fm-error-reporting.c:169
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Ezin izan da \"%s\"(r)en taldea aldatu, irakurtzeko soilik den disko batean "
 "dagoelako"
 
-#: ../src/file-manager/fm-error-reporting.c:177
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Ezin izan da \"%s\"(r)en taldea aldatu."
 
-#: ../src/file-manager/fm-error-reporting.c:181
+#: src/file-manager/fm-error-reporting.c:181
 msgid "The group could not be changed."
 msgstr "Ezin izan da taldea aldatu."
 
-#: ../src/file-manager/fm-error-reporting.c:181
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Errorea taldea ezartzean"
 
-#: ../src/file-manager/fm-error-reporting.c:203
+#: src/file-manager/fm-error-reporting.c:203
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Ezin izan da \"%s\"(r)en jabea aldatu, irakurtzeko soilik den disko batean "
 "dagoelako"
 
-#: ../src/file-manager/fm-error-reporting.c:210
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Ezin izan da \"%s\"(r)en jabea aldatu."
 
-#: ../src/file-manager/fm-error-reporting.c:213
+#: src/file-manager/fm-error-reporting.c:213
 msgid "The owner could not be changed."
 msgstr "Ezin izan da jabea aldatu."
 
-#: ../src/file-manager/fm-error-reporting.c:213
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Errorea jabea ezartzean"
 
-#: ../src/file-manager/fm-error-reporting.c:235
+#: src/file-manager/fm-error-reporting.c:235
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -3853,109 +4145,104 @@ msgstr ""
 "Ezin izan dira \"%s\"(r)en baimenak aldatu, irakurtzeko soilik den disko "
 "batean dagoelako"
 
-#: ../src/file-manager/fm-error-reporting.c:242
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Ezin izan dira \"%s\"(r)en baimenak aldatu."
 
-#: ../src/file-manager/fm-error-reporting.c:245
+#: src/file-manager/fm-error-reporting.c:245
 msgid "The permissions could not be changed."
 msgstr "Ezin izan dira baimenak aldatu."
 
-#: ../src/file-manager/fm-error-reporting.c:246
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Errorea baimenak ezartzean"
 
-#: ../src/file-manager/fm-error-reporting.c:312
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\"izenaren ordez \"%s\" jarriko da."
 
-#: ../src/file-manager/fm-error-reporting.c:317
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Izena aldatzea bertan behera utzi?"
 
-#: ../src/file-manager/fm-icon-view.c:134
+#: src/file-manager/fm-icon-view.c:134
 msgid "by _Name"
 msgstr "_Izenaren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:135
-#: ../src/file-manager/fm-icon-view.c:1437
+#: src/file-manager/fm-icon-view.c:135 src/file-manager/fm-icon-view.c:1431
 msgid "Keep icons sorted by name in rows"
 msgstr "Ikonoak errenkadetan ipintzen ditu izenaren arabera antolatuta"
 
-#: ../src/file-manager/fm-icon-view.c:141
+#: src/file-manager/fm-icon-view.c:141
 msgid "by _Size"
 msgstr "_Tamainaren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:142
-#: ../src/file-manager/fm-icon-view.c:1441
+#: src/file-manager/fm-icon-view.c:142 src/file-manager/fm-icon-view.c:1435
 msgid "Keep icons sorted by size in rows"
 msgstr "Ikonoak errenkadetan ipintzen ditu tamainaren arabera antolatuta"
 
-#: ../src/file-manager/fm-icon-view.c:148
+#: src/file-manager/fm-icon-view.c:148
 msgid "by _Type"
 msgstr "_Motaren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:149
-#: ../src/file-manager/fm-icon-view.c:1445
+#: src/file-manager/fm-icon-view.c:149 src/file-manager/fm-icon-view.c:1439
 msgid "Keep icons sorted by type in rows"
 msgstr "Ikonoak errenkadetan ipintzen ditu motaren arabera antolatuta"
 
-#: ../src/file-manager/fm-icon-view.c:155
+#: src/file-manager/fm-icon-view.c:155
 msgid "by Modification _Date"
 msgstr "Aldatze-_dataren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:156
-#: ../src/file-manager/fm-icon-view.c:1449
+#: src/file-manager/fm-icon-view.c:156 src/file-manager/fm-icon-view.c:1443
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Ikonoak errenkadetan ipintzen ditu aldatze-dataren arabera antolatuta"
 
-#: ../src/file-manager/fm-icon-view.c:162
+#: src/file-manager/fm-icon-view.c:162
 msgid "by _Emblems"
 msgstr "_Ikurren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:163
-#: ../src/file-manager/fm-icon-view.c:1453
+#: src/file-manager/fm-icon-view.c:163 src/file-manager/fm-icon-view.c:1447
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Ikonoak errenkadetan ipintzen ditu ikurren arabera antolatuta"
 
-#: ../src/file-manager/fm-icon-view.c:1397
+#: src/file-manager/fm-icon-view.c:1391
 msgid "Arran_ge Items"
 msgstr "Antolatu _elementuak"
 
 #
 #. name, stock id, label
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1399
+#: src/file-manager/fm-icon-view.c:1393
 msgid "Str_etch Icon"
 msgstr "_Luzatu ikonoa"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1400
+#: src/file-manager/fm-icon-view.c:1394
 msgid "Make the selected icon stretchable"
 msgstr "Hautatutako ikonoa tiragarri egiten du"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1403
-#: ../src/file-manager/fm-icon-view.c:1554
+#: src/file-manager/fm-icon-view.c:1397 src/file-manager/fm-icon-view.c:1548
 msgid "Restore Icons' Original Si_zes"
 msgstr "Berrezarri ikonoen _jatorrizko tamaina"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1404
+#: src/file-manager/fm-icon-view.c:1398
 msgid "Restore each selected icon to its original size"
 msgstr "Hautatutako ikonoak jatorrizko tamainara leheneratzen ditu"
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1407
+#: src/file-manager/fm-icon-view.c:1401
 msgid "Clean _Up by Name"
 msgstr "Antolatu ize_naren arabera"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1408
+#: src/file-manager/fm-icon-view.c:1402
+#, fuzzy
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 "Ikonoak antolatzen ditu leihoari hobeto egokitzeko eta elkarren gainean ez "
@@ -3963,240 +4250,195 @@ msgstr ""
 
 #
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1414
+#: src/file-manager/fm-icon-view.c:1408
 msgid "Compact _Layout"
 msgstr "Diseinu t_rinkoa"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1415
+#: src/file-manager/fm-icon-view.c:1409
 msgid "Toggle using a tighter layout scheme"
 msgstr "Diseinu-eskema estuagoa ezarri eta kentzen du"
 
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1419
+#: src/file-manager/fm-icon-view.c:1413
 msgid "Re_versed Order"
 msgstr "Al_derantzizko ordena"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1420
+#: src/file-manager/fm-icon-view.c:1414
 msgid "Display icons in the opposite order"
 msgstr "Bistaratu ikonoak alderantzizko ordenan"
 
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1424
+#: src/file-manager/fm-icon-view.c:1418
 msgid "_Keep Aligned"
 msgstr "Edu_ki lerrokatuta"
 
 #
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1425
+#: src/file-manager/fm-icon-view.c:1419
 msgid "Keep icons lined up on a grid"
 msgstr "Eduki ikonoak sareta batean lerrokatuta"
 
-#: ../src/file-manager/fm-icon-view.c:1432
+#: src/file-manager/fm-icon-view.c:1426
 msgid "_Manually"
 msgstr "_Eskuz"
 
-#: ../src/file-manager/fm-icon-view.c:1433
+#: src/file-manager/fm-icon-view.c:1427
 msgid "Leave icons wherever they are dropped"
 msgstr "Jaregiten zaien lekuan uzten ditu ikonoak"
 
-#: ../src/file-manager/fm-icon-view.c:1436
+#: src/file-manager/fm-icon-view.c:1430
 msgid "By _Name"
 msgstr "I_zenaren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:1440
+#: src/file-manager/fm-icon-view.c:1434
 msgid "By _Size"
 msgstr "_Tamainaren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:1444
+#: src/file-manager/fm-icon-view.c:1438
 msgid "By _Type"
 msgstr "_Motaren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:1448
+#: src/file-manager/fm-icon-view.c:1442
 msgid "By Modification _Date"
 msgstr "Aldatze-_dataren arabera"
 
-#: ../src/file-manager/fm-icon-view.c:1452
+#: src/file-manager/fm-icon-view.c:1446
 msgid "By _Emblems"
 msgstr "_Ikurren arabera"
 
 #
-#: ../src/file-manager/fm-icon-view.c:1555
+#: src/file-manager/fm-icon-view.c:1549
 msgid "Restore Icon's Original Si_ze"
 msgstr "Berrezarri ikonoen j_atorrizko tamaina"
 
-#: ../src/file-manager/fm-icon-view.c:1956
+#: src/file-manager/fm-icon-view.c:1910
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" seinalatzen"
 
-#: ../src/file-manager/fm-icon-view.c:2730
+#: src/file-manager/fm-icon-view.c:2673
 msgid "Icons"
 msgstr "Ikonoak"
 
-#
-#: ../src/file-manager/fm-icon-view.c:2731
-msgid "View as Icons"
-msgstr "Ikusi ikono gisa"
-
-#
-#: ../src/file-manager/fm-icon-view.c:2732
-msgid "View as _Icons"
-msgstr "Ikusi _ikono gisa"
-
-#: ../src/file-manager/fm-icon-view.c:2733
-msgid "The icon view encountered an error."
-msgstr "Ikono-ikuspegiak errorea aurkitu du."
-
-#: ../src/file-manager/fm-icon-view.c:2734
-msgid "The icon view encountered an error while starting up."
-msgstr "Ikono-ikuspegiak errorea aurkitu du abiaraztean."
-
-#: ../src/file-manager/fm-icon-view.c:2735
-msgid "Display this location with the icon view."
-msgstr "Bistaratu helbidea ikono-ikuspegiarekin"
-
-#
-#: ../src/file-manager/fm-list-model.c:363
-#: ../src/file-manager/fm-tree-model.c:1212
-msgid "(Empty)"
-msgstr "(Hutsa)"
-
-#
-#: ../src/file-manager/fm-list-model.c:365
-#: ../src/file-manager/fm-tree-model.c:1212
-msgid "Loading..."
-msgstr "Kargatzen..."
+#: src/file-manager/fm-icon-view.c:2674
+#, fuzzy
+msgid "_Icons"
+msgstr "Ikonoak"
 
-#: ../src/file-manager/fm-list-view.c:1986
+#: src/file-manager/fm-list-view.c:1593
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s zutabe ikusgaiak"
 
 #
-#: ../src/file-manager/fm-list-view.c:2005
+#: src/file-manager/fm-list-view.c:1612
 msgid "Choose the order of information to appear in this folder."
 msgstr "Aukeratu informazioaren ordena, karpetan agertzeko."
 
 #. name, stock id
-#: ../src/file-manager/fm-list-view.c:2047
+#: src/file-manager/fm-list-view.c:1654
 msgid "Visible _Columns..."
 msgstr "_Zutabe ikusgaiak..."
 
 #. label, accelerator
-#: ../src/file-manager/fm-list-view.c:2048
+#: src/file-manager/fm-list-view.c:1655
 msgid "Select the columns visible in this folder"
 msgstr "Hautatu zutabe ikusgaiak karpeta honetan"
 
-#: ../src/file-manager/fm-list-view.c:2732
+#: src/file-manager/fm-list-view.c:2305
 msgid "List"
 msgstr "Zerrenda"
 
-#
-#: ../src/file-manager/fm-list-view.c:2733
-msgid "View as List"
-msgstr "Ikusi zerrenda gisa"
-
-#
-#: ../src/file-manager/fm-list-view.c:2734
-msgid "View as _List"
-msgstr "Ikusi _zerrenda gisa"
-
-#: ../src/file-manager/fm-list-view.c:2735
-msgid "The list view encountered an error."
-msgstr "Zerrenda-ikuspegiak errorea aurkitu du."
-
-#: ../src/file-manager/fm-list-view.c:2736
-msgid "The list view encountered an error while starting up."
-msgstr "Zerrenda-ikuspegiak errorea aurkitu du abiaraztean."
-
-#: ../src/file-manager/fm-list-view.c:2737
-msgid "Display this location with the list view."
-msgstr "Bistaratu helbidea zerrenda-ikuspegiarekin."
+#: src/file-manager/fm-list-view.c:2306
+#, fuzzy
+msgid "_List"
+msgstr "Zerrenda"
 
-#: ../src/file-manager/fm-properties-window.c:512
+#: src/file-manager/fm-properties-window.c:482
 msgid "You can't assign more than one custom icon at a time!"
 msgstr "Ezin dituzu ikono pertsonalizatu bat baino gehiago batera esleitu!"
 
-#: ../src/file-manager/fm-properties-window.c:513
-#: ../src/nautilus-information-panel.c:555
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:548
 msgid "Please drag just one image to set a custom icon."
 msgstr "Arrastatu irudi bakarra ikono pertsonalizatu bat ezartzeko."
 
-#: ../src/file-manager/fm-properties-window.c:514
-#: ../src/nautilus-information-panel.c:556
+#: src/file-manager/fm-properties-window.c:484
+#: src/nautilus-information-panel.c:549
 msgid "More Than One Image"
 msgstr "Irudi bat baino gehiago"
 
-#: ../src/file-manager/fm-properties-window.c:523
-#: ../src/nautilus-information-panel.c:575
+#: src/file-manager/fm-properties-window.c:493
+#: src/nautilus-information-panel.c:568
 msgid "The file that you dropped is not local."
 msgstr "Jaregin duzun fitxategia ez da lokala."
 
-#: ../src/file-manager/fm-properties-window.c:524
-#: ../src/file-manager/fm-properties-window.c:531
-#: ../src/nautilus-information-panel.c:576
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:569
 msgid "You can only use local images as custom icons."
 msgstr "Irudi lokalak bakarrik erabil ditzakezu ikono pertsonal gisa."
 
-#: ../src/file-manager/fm-properties-window.c:525
-#: ../src/nautilus-information-panel.c:577
+#: src/file-manager/fm-properties-window.c:495
+#: src/nautilus-information-panel.c:570
 msgid "Local Images Only"
 msgstr "Irudi lokalak bakarrik"
 
-#: ../src/file-manager/fm-properties-window.c:530
-#: ../src/nautilus-information-panel.c:582
+#: src/file-manager/fm-properties-window.c:500
+#: src/nautilus-information-panel.c:575
 msgid "The file that you dropped is not an image."
 msgstr "Jaregin duzun fitxategia ez da irudia."
 
-#: ../src/file-manager/fm-properties-window.c:532
-#: ../src/nautilus-information-panel.c:584
+#: src/file-manager/fm-properties-window.c:502
+#: src/nautilus-information-panel.c:577
 msgid "Images Only"
 msgstr "Irudiak bakarrik"
 
 #
-#: ../src/file-manager/fm-properties-window.c:1015
+#: src/file-manager/fm-properties-window.c:927
+#: src/file-manager/fm-tree-view.c:1203
 msgid "Properties"
 msgstr "Propietateak"
 
-#: ../src/file-manager/fm-properties-window.c:1023
+#: src/file-manager/fm-properties-window.c:935
 #, c-format
 msgid "%s Properties"
 msgstr "%s - Propietateak"
 
-#: ../src/file-manager/fm-properties-window.c:1537
+#: src/file-manager/fm-properties-window.c:1449
 msgid "Cancel Group Change?"
 msgstr "Talde-aldaketa bertan behera utzi?"
 
-#: ../src/file-manager/fm-properties-window.c:1538
+#: src/file-manager/fm-properties-window.c:1450
 msgid "Changing group."
 msgstr "Taldea aldatzen"
 
-#: ../src/file-manager/fm-properties-window.c:1699
+#: src/file-manager/fm-properties-window.c:1611
 msgid "Cancel Owner Change?"
 msgstr "Jabe-aldaketa bertan behera utzi?"
 
-#: ../src/file-manager/fm-properties-window.c:1700
+#: src/file-manager/fm-properties-window.c:1612
 msgid "Changing owner."
 msgstr "Jabea aldatzen"
 
-#: ../src/file-manager/fm-properties-window.c:1906
+#: src/file-manager/fm-properties-window.c:1818
 msgid "nothing"
 msgstr "ezer ere ez"
 
-#: ../src/file-manager/fm-properties-window.c:1908
+#: src/file-manager/fm-properties-window.c:1820
 msgid "unreadable"
 msgstr "irakurtezina"
 
-#: ../src/file-manager/fm-properties-window.c:1918
+#: src/file-manager/fm-properties-window.c:1830
 #, c-format
 msgid "%d item, with size %s"
 msgid_plural "%d items, totalling %s"
 msgstr[0] "%d elementu, %s tamainakoa"
 msgstr[1] "elementu %d, %s tamainakoa"
 
-#: ../src/file-manager/fm-properties-window.c:1927
+#: src/file-manager/fm-properties-window.c:1839
 msgid "(some contents unreadable)"
 msgstr "(eduki batzuk irakurtezinak)"
 
@@ -4206,259 +4448,283 @@ msgstr "(eduki batzuk irakurtezinak)"
 #. * 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:1944
+#: src/file-manager/fm-properties-window.c:1856
 msgid "Contents:"
 msgstr "Edukia:"
 
-#: ../src/file-manager/fm-properties-window.c:2329
+#: src/file-manager/fm-properties-window.c:2247
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
 #
-#. Name label
-#: ../src/file-manager/fm-properties-window.c:2357
+#: src/file-manager/fm-properties-window.c:2275
+msgid "_Names:"
+msgstr "_Izenak:"
+
+#
+#: src/file-manager/fm-properties-window.c:2277
 msgid "_Name:"
-msgid_plural "_Names:"
-msgstr[0] "_Izena:"
-msgstr[1] "_Izenak:"
+msgstr "_Izena:"
 
-#: ../src/file-manager/fm-properties-window.c:2376
+#: src/file-manager/fm-properties-window.c:2326
 msgid "Type:"
 msgstr "Mota:"
 
-#: ../src/file-manager/fm-properties-window.c:2378
-#: ../src/file-manager/fm-properties-window.c:2388
-#: ../src/file-manager/fm-properties-window.c:2394
-#: ../src/file-manager/fm-properties-window.c:2401
-#: ../src/file-manager/fm-properties-window.c:2405
-#: ../src/file-manager/fm-properties-window.c:2413
-#: ../src/file-manager/fm-properties-window.c:2419
-#: ../src/file-manager/fm-properties-window.c:2428
-#: ../src/file-manager/fm-properties-window.c:2434
-#: ../src/file-manager/fm-properties-window.c:3027
-#: ../src/file-manager/fm-properties-window.c:3048
-#: ../src/file-manager/fm-properties-window.c:3139
-#: ../src/file-manager/fm-properties-window.c:3143
-#: ../src/file-manager/fm-properties-window.c:3147
+#: src/file-manager/fm-properties-window.c:2328
+#: src/file-manager/fm-properties-window.c:2338
+#: src/file-manager/fm-properties-window.c:2344
+#: src/file-manager/fm-properties-window.c:2351
+#: src/file-manager/fm-properties-window.c:2355
+#: src/file-manager/fm-properties-window.c:2363
+#: src/file-manager/fm-properties-window.c:2369
+#: src/file-manager/fm-properties-window.c:2378
+#: src/file-manager/fm-properties-window.c:2384
+#: src/file-manager/fm-properties-window.c:2977
+#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:3089
+#: src/file-manager/fm-properties-window.c:3093
+#: src/file-manager/fm-properties-window.c:3097
 msgid "--"
 msgstr "--"
 
-#: ../src/file-manager/fm-properties-window.c:2386
+#: src/file-manager/fm-properties-window.c:2336
 msgid "Size:"
 msgstr "Tamaina:"
 
-#: ../src/file-manager/fm-properties-window.c:2392
-#: ../src/nautilus-location-bar.c:60
+#: src/file-manager/fm-properties-window.c:2342 src/nautilus-location-bar.c:60
 msgid "Location:"
 msgstr "Kokalekua:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2399
+#: src/file-manager/fm-properties-window.c:2349
 msgid "Volume:"
 msgstr "Bolumena:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2403
+#: src/file-manager/fm-properties-window.c:2353
 msgid "Free space:"
 msgstr "Leku librea:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2411
+#: src/file-manager/fm-properties-window.c:2361
 msgid "Link target:"
 msgstr "Estekaren helburua:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2417
+#: src/file-manager/fm-properties-window.c:2367
 msgid "MIME type:"
 msgstr "MIME mota:"
 
-#: ../src/file-manager/fm-properties-window.c:2426
+#: src/file-manager/fm-properties-window.c:2376
 msgid "Modified:"
 msgstr "Aldatze-data:"
 
-#: ../src/file-manager/fm-properties-window.c:2432
+#: src/file-manager/fm-properties-window.c:2382
 msgid "Accessed:"
 msgstr "Atzitze-data:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2448
+#: src/file-manager/fm-properties-window.c:2398
 msgid "_Select Custom Icon..."
 msgstr "_Hautatu ikono pertsonalizatua..."
 
 #
-#: ../src/file-manager/fm-properties-window.c:2454
+#: src/file-manager/fm-properties-window.c:2404
 msgid "_Remove Custom Icon"
 msgstr "_Kendu ikono pertsonalizatua"
 
-#: ../src/file-manager/fm-properties-window.c:2521
-#: ../src/nautilus-emblem-sidebar.c:1045
+#: src/file-manager/fm-properties-window.c:2471
+#: src/nautilus-emblem-sidebar.c:1045
 msgid "Emblems"
 msgstr "Ikurrak"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2806
+#: src/file-manager/fm-properties-window.c:2756
 msgid "_Read"
 msgstr "_Irakurri"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2808
+#: src/file-manager/fm-properties-window.c:2758
 msgid "_Write"
 msgstr "I_datzi"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2810
+#: src/file-manager/fm-properties-window.c:2760
 msgid "E_xecute"
 msgstr "E_xekutatu"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2843
 msgid "Set _user ID"
 msgstr "Ezarri _erabiltzailearen IDa"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2898
+#: src/file-manager/fm-properties-window.c:2848
 msgid "Special flags:"
 msgstr "Bandera bereziak:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2901
+#: src/file-manager/fm-properties-window.c:2851
 msgid "Set gro_up ID"
 msgstr "Ezarri _taldearen IDa"
 
 #
-#: ../src/file-manager/fm-properties-window.c:2903
+#: src/file-manager/fm-properties-window.c:2853
 msgid "_Sticky"
 msgstr "Itsas_korra"
 
-#: ../src/file-manager/fm-properties-window.c:3002
+#: src/file-manager/fm-properties-window.c:2952
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Ez zara jabea, beraz ezin dituzu baimen hauek aldatu."
 
 #
-#: ../src/file-manager/fm-properties-window.c:3016
+#: src/file-manager/fm-properties-window.c:2966
 msgid "File _owner:"
 msgstr "Fitxategi-j_abea:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:3022
+#: src/file-manager/fm-properties-window.c:2972
 msgid "File owner:"
 msgstr "Fitxategi-jabea:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:3033
+#: src/file-manager/fm-properties-window.c:2983
 msgid "_File group:"
 msgstr "_Fitxategi-taldea:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:3042
+#: src/file-manager/fm-properties-window.c:2992
 msgid "File group:"
 msgstr "Fitxategi-taldea:"
 
-#: ../src/file-manager/fm-properties-window.c:3054
+#: src/file-manager/fm-properties-window.c:3004
 msgid "Owner:"
 msgstr "Jabea:"
 
-#: ../src/file-manager/fm-properties-window.c:3055
+#: src/file-manager/fm-properties-window.c:3005
 msgid "Group:"
 msgstr "Taldea:"
 
-#: ../src/file-manager/fm-properties-window.c:3056
+#: src/file-manager/fm-properties-window.c:3006
 msgid "Others:"
 msgstr "Besterik:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:3138
+#: src/file-manager/fm-properties-window.c:3088
 msgid "Text view:"
 msgstr "Testu-ikuspegia:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:3142
+#: src/file-manager/fm-properties-window.c:3092
 msgid "Number view:"
 msgstr "Zenbaki-ikuspegia:"
 
 #
-#: ../src/file-manager/fm-properties-window.c:3146
+#: src/file-manager/fm-properties-window.c:3096
 msgid "Last changed:"
 msgstr "Azken aldaketa:"
 
-#: ../src/file-manager/fm-properties-window.c:3152
+#: src/file-manager/fm-properties-window.c:3102
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Ezin izan dira \"%s\"(r)en baimenak zehaztu."
 
 #
-#: ../src/file-manager/fm-properties-window.c:3155
+#: src/file-manager/fm-properties-window.c:3105
 msgid "The permissions of the selected file could not be determined."
 msgstr "Ezin izan dira hautatutako fitxategiaren baimenak zehaztu."
 
-#: ../src/file-manager/fm-properties-window.c:3313
+#: src/file-manager/fm-properties-window.c:3263
 msgid "There was an error displaying help."
 msgstr "Errorea gertatu da laguntza bistaratzean."
 
 #
-#: ../src/file-manager/fm-properties-window.c:3313
+#: src/file-manager/fm-properties-window.c:3263
 msgid "Couldn't Show Help"
 msgstr "Ezin izan da laguntza erakutsi"
 
-#: ../src/file-manager/fm-properties-window.c:3370
+#: src/file-manager/fm-properties-window.c:3305
 msgid "Open With"
 msgstr "Ireki honekin"
 
-#: ../src/file-manager/fm-properties-window.c:3708
+#: src/file-manager/fm-properties-window.c:3643
 msgid "Cancel Showing Properties Window?"
 msgstr "Propietateen leihoa erakustea bertan behera utzi?"
 
-#: ../src/file-manager/fm-properties-window.c:3709
+#: src/file-manager/fm-properties-window.c:3644
 msgid "Creating Properties window."
 msgstr "Propietateen leihoa sortzen."
 
 #
-#: ../src/file-manager/fm-properties-window.c:3866
+#: src/file-manager/fm-properties-window.c:3801
 msgid "Select an icon"
 msgstr "Hautatu ikono bat"
 
 #
-#: ../src/file-manager/fm-tree-view.c:750
+#: src/file-manager/fm-tree-model.c:1200
+msgid "(Empty)"
+msgstr "(Hutsa)"
+
+#
+#: src/file-manager/fm-tree-model.c:1200
+msgid "Loading..."
+msgstr "Kargatzen..."
+
+#
+#: src/file-manager/fm-tree-view.c:745
 msgid "E_ject"
 msgstr "E_gotzi"
 
+#: src/file-manager/fm-tree-view.c:1099
+msgid "Open"
+msgstr "Ireki"
+
 #
 #. add the "create folder" menu item
-#: ../src/file-manager/fm-tree-view.c:1129
+#: src/file-manager/fm-tree-view.c:1123
 msgid "Create Folder"
 msgstr "Sortu karpeta"
 
-#: ../src/file-manager/fm-tree-view.c:1181
+#
+#: src/file-manager/fm-tree-view.c:1139
+msgid "Cut Folder"
+msgstr "Ebaki karpeta"
+
+#: src/file-manager/fm-tree-view.c:1153
+msgid "Copy Folder"
+msgstr "Kopiatu karpeta"
+
+#
+#: src/file-manager/fm-tree-view.c:1167
+msgid "Paste Files into Folder"
+msgstr "Itsatsi fitxategiak karpetan"
+
+#: src/file-manager/fm-tree-view.c:1185
 msgid "Move to Trash"
 msgstr "Eraman zakarrontzira"
 
-#: ../src/file-manager/fm-tree-view.c:1245
-#: ../src/nautilus-places-sidebar.c:170
-msgid "File System"
+#: src/file-manager/fm-tree-view.c:1254
+msgid "Filesystem"
 msgstr "Fitxategi-sistema"
 
-#: ../src/file-manager/fm-tree-view.c:1247
+#: src/file-manager/fm-tree-view.c:1256
 msgid "Network Neighbourhood"
 msgstr "Sare-ingurunea"
 
-#: ../src/file-manager/fm-tree-view.c:1488
+#: src/file-manager/fm-tree-view.c:1497
 msgid "Tree"
 msgstr "Zuhaitza"
 
-#: ../src/file-manager/fm-tree-view.c:1494
-msgid "Show Tree"
-msgstr "Erakutsi zuhaitza"
-
-#: ../src/nautilus-application.c:257
+#: src/nautilus-application.c:251
 msgid "Couldn't Create Required Folder"
 msgstr "Ezin izan da beharrezkoa den karpeta sortu"
 
-#: ../src/nautilus-application.c:258
+#: src/nautilus-application.c:252
 #, c-format
 msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nautilus-ek ezin izan du %s karpeta sortu."
 
-#: ../src/nautilus-application.c:260
+#: src/nautilus-application.c:254
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
@@ -4466,16 +4732,16 @@ msgstr ""
 "Nautilus exekutatu aurretik, sortu karpeta hori edo ezarri Nautilus-ek "
 "karpeta sortzeko behar dituen baimenak."
 
-#: ../src/nautilus-application.c:263
+#: src/nautilus-application.c:257
 msgid "Couldn't Create Required Folders"
 msgstr "Ezin izan dira beharrezkoak diren karpetak sortu"
 
-#: ../src/nautilus-application.c:264
+#: src/nautilus-application.c:258
 #, c-format
 msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nautilus-ek ezin izan du hurrengo karpetarik sortu: %s."
 
-#: ../src/nautilus-application.c:266
+#: src/nautilus-application.c:260
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
@@ -4484,15 +4750,15 @@ msgstr ""
 "karpetak sortzeko behar dituen baimenak."
 
 #
-#: ../src/nautilus-application.c:334
+#: src/nautilus-application.c:328
 msgid "Link To Old Desktop"
 msgstr "Estekatu mahaigain zaharrari"
 
-#: ../src/nautilus-application.c:350
+#: src/nautilus-application.c:344
 msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
 msgstr " \"Estekatu mahaigain zaharrari\" esteka sortu da mahaigainean."
 
-#: ../src/nautilus-application.c:351
+#: src/nautilus-application.c:345
 msgid ""
 "The location of the desktop directory has changed in GNOME 2.4. You can open "
 "the link and move over the files you want, then delete the link."
@@ -4501,7 +4767,7 @@ msgstr ""
 "ireki dezakezu nahi dituzun fitxategiak lekuz aldatzeko; ondoren, ezabatu "
 "esteka."
 
-#: ../src/nautilus-application.c:353
+#: src/nautilus-application.c:347
 msgid "Migrated Old Desktop"
 msgstr "Mahaigain zaharra migratuta"
 
@@ -4516,7 +4782,7 @@ msgstr "Mahaigain zaharra migratuta"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: ../src/nautilus-application.c:511
+#: src/nautilus-application.c:506
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -4528,7 +4794,7 @@ msgstr ""
 
 #
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: ../src/nautilus-application.c:517
+#: src/nautilus-application.c:512
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -4575,13 +4841,13 @@ msgstr ""
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: ../src/nautilus-application.c:547 ../src/nautilus-application.c:565
-#: ../src/nautilus-application.c:572
+#: src/nautilus-application.c:542 src/nautilus-application.c:560
+#: src/nautilus-application.c:567
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Orain ezin da Nautilus erabili, ustekabeko errore bat gertatu delako."
 
 #
-#: ../src/nautilus-application.c:548
+#: src/nautilus-application.c:543
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -4591,7 +4857,7 @@ msgstr ""
 "delako."
 
 #
-#: ../src/nautilus-application.c:566
+#: src/nautilus-application.c:561
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the factory.Killing bonobo-activation-server and "
@@ -4602,7 +4868,7 @@ msgstr ""
 "Nautilus berrabiarazteak arazoa konpon dezake."
 
 #
-#: ../src/nautilus-application.c:573
+#: src/nautilus-application.c:568
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the shell object. Killing bonobo-activation-server and "
@@ -4612,9 +4878,9 @@ msgstr ""
 "Bonobon ustekabeko errorea gertatu delako. bonobo-activation-server itxi eta "
 "Nautilus berrabiarazteak arazoa konpon dezake."
 
-#: ../src/nautilus-bookmarks-window.c:157
-#: ../src/nautilus-file-management-properties.c:229
-#: ../src/nautilus-property-browser.c:1525 ../src/nautilus-window-menus.c:507
+#: src/nautilus-bookmarks-window.c:154
+#: src/nautilus-file-management-properties.c:229
+#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:502
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4623,182 +4889,199 @@ msgstr ""
 "Errorea gertatu da laguntza bistaratzean: \n"
 "%s"
 
-#: ../src/nautilus-bookmarks-window.c:191
+#: src/nautilus-bookmarks-window.c:188
 msgid "No bookmarks defined"
 msgstr "Ez da laster-markarik definitu"
 
 #
-#: ../src/nautilus-bookmarks-window.glade.h:1
+#: src/nautilus-bookmarks-window.glade.h:1
 msgid "<b>_Bookmarks</b>"
 msgstr "<b>_Laster-markak</b>"
 
 #
-#: ../src/nautilus-bookmarks-window.glade.h:2
+#: src/nautilus-bookmarks-window.glade.h:2
 msgid "<b>_Location</b>"
 msgstr "<b>_Kokalekua</b>"
 
-#: ../src/nautilus-bookmarks-window.glade.h:3
+#: src/nautilus-bookmarks-window.glade.h:3
 msgid "<b>_Name</b>"
 msgstr "<b>_Izena</b>"
 
 #
-#: ../src/nautilus-bookmarks-window.glade.h:4
+#: src/nautilus-bookmarks-window.glade.h:4
 msgid "Edit Bookmarks"
 msgstr "Editatu laster-markak"
 
-#: ../src/nautilus-connect-server-dialog-main.c:67
-#, c-format
+#: src/nautilus-connect-server-dialog-main.c:66
+#, fuzzy, c-format
 msgid "Can't display location \"%s\""
-msgstr "Ezin da \"%s\" helbidea bistaratu"
+msgstr "Ezin da Helbidea bistaratu"
 
-#: ../src/nautilus-connect-server-dialog.c:145
-#: ../src/nautilus-connect-server-dialog.c:160
+#: src/nautilus-connect-server-dialog.c:143
+#: src/nautilus-connect-server-dialog.c:158
 msgid "Can't Connect to Server"
 msgstr "Ezin da zerbitzariarekin konektatu"
 
-#: ../src/nautilus-connect-server-dialog.c:158
+#: src/nautilus-connect-server-dialog.c:156
 msgid "You must enter a name for the server."
 msgstr "Sartu zerbitzariaren izena."
 
-#: ../src/nautilus-connect-server-dialog.c:159
+#: src/nautilus-connect-server-dialog.c:157
 msgid "Please enter a name and try again."
 msgstr "Sartu izena eta saiatu berriro."
 
+#: src/nautilus-connect-server-dialog.c:269 src/nautilus-window.c:961
+#, fuzzy, c-format
+msgid "%s on %s"
+msgstr "%s - %s"
+
 #
-#: ../src/nautilus-connect-server-dialog.c:410
+#: src/nautilus-connect-server-dialog.c:388
+#, fuzzy
 msgid "_Location (URI):"
 msgstr "_Helbidea (URLa):"
 
 #
-#: ../src/nautilus-connect-server-dialog.c:457
+#: src/nautilus-connect-server-dialog.c:432
+#, fuzzy
 msgid "_Server:"
-msgstr "_Zerbitzaria:"
+msgstr "_Inoiz ez"
 
 #
-#: ../src/nautilus-connect-server-dialog.c:476
+#: src/nautilus-connect-server-dialog.c:451
+#, fuzzy
 msgid "Optional information:"
-msgstr "Aukerako informazioa:"
+msgstr "Informazioa"
 
-#: ../src/nautilus-connect-server-dialog.c:488
+#: src/nautilus-connect-server-dialog.c:463
+#, fuzzy
 msgid "_Share:"
-msgstr "_Partekatu:"
+msgstr "Arbela"
 
-#: ../src/nautilus-connect-server-dialog.c:509
+#: src/nautilus-connect-server-dialog.c:484
+#, fuzzy
 msgid "_Port:"
-msgstr "_Ataka:"
+msgstr "Ataka:"
 
-#: ../src/nautilus-connect-server-dialog.c:529
+#: src/nautilus-connect-server-dialog.c:504
+#, fuzzy
 msgid "_Folder:"
-msgstr "_Karpeta:"
+msgstr "Kar_peta berria"
 
-#: ../src/nautilus-connect-server-dialog.c:549
+#: src/nautilus-connect-server-dialog.c:524
+#, fuzzy
 msgid "_User Name:"
-msgstr "_Erabiltzaile-izena:"
-
-#
-#: ../src/nautilus-connect-server-dialog.c:570
-msgid "_Domain Name:"
-msgstr "_Domeinu-izena:"
+msgstr "Erabiltzaile-izena:"
 
-#: ../src/nautilus-connect-server-dialog.c:594
+#: src/nautilus-connect-server-dialog.c:547
 msgid "_Name to use for connection:"
-msgstr "_Izena konezioan erabiltzeko:"
+msgstr ""
 
 #
-#: ../src/nautilus-connect-server-dialog.c:652
+#: src/nautilus-connect-server-dialog.c:605
 msgid "Connect to Server"
 msgstr "Konektatu zerbitzarira"
 
-#: ../src/nautilus-connect-server-dialog.c:669
+#: src/nautilus-connect-server-dialog.c:622
+#, fuzzy
 msgid "Service _type:"
-msgstr "Zerbitzu _mota:"
+msgstr "Zerbitzuak"
 
-#: ../src/nautilus-connect-server-dialog.c:678
+#: src/nautilus-connect-server-dialog.c:631
 msgid "SSH"
-msgstr "SSH"
+msgstr ""
 
-#: ../src/nautilus-connect-server-dialog.c:680
+#: src/nautilus-connect-server-dialog.c:633
 msgid "Public FTP"
-msgstr "FTP publikoa"
+msgstr ""
 
-#: ../src/nautilus-connect-server-dialog.c:682
+#: src/nautilus-connect-server-dialog.c:635
 msgid "FTP (with login)"
-msgstr "FTP (saioarekin)"
+msgstr ""
 
-#: ../src/nautilus-connect-server-dialog.c:684
+#: src/nautilus-connect-server-dialog.c:637
+#, fuzzy
 msgid "Windows share"
-msgstr "Windows-ek partekatua"
+msgstr "Windows Shared bolumena"
 
-#: ../src/nautilus-connect-server-dialog.c:686
+#: src/nautilus-connect-server-dialog.c:639
 msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
+msgstr ""
 
-#: ../src/nautilus-connect-server-dialog.c:688
+#: src/nautilus-connect-server-dialog.c:641
 msgid "Secure WebDAV (HTTPS)"
-msgstr "WebDAV segurua (HTTPS)"
+msgstr ""
 
-#: ../src/nautilus-connect-server-dialog.c:690
+#: src/nautilus-connect-server-dialog.c:643
+#, fuzzy
 msgid "Custom Location"
-msgstr "Helbide pertsonalizatua"
+msgstr "Kokalekua:"
 
 #
-#: ../src/nautilus-connect-server-dialog.c:742
+#: src/nautilus-connect-server-dialog.c:693
+#, fuzzy
 msgid "Browse _Network"
-msgstr "Arakatu _sarea"
+msgstr "Windows sarea"
 
 #
-#: ../src/nautilus-connect-server-dialog.c:748
+#: src/nautilus-connect-server-dialog.c:699
 msgid "C_onnect"
 msgstr "_Konektatu"
 
 #
-#: ../src/nautilus-emblem-sidebar.c:241
+#: src/nautilus-emblem-sidebar.c:241
 #, c-format
 msgid "Couldn't remove emblem with name '%s'."
 msgstr "Ezin izan da \"%s\" izeneko ikurra kendu"
 
-#: ../src/nautilus-emblem-sidebar.c:242 ../src/nautilus-emblem-sidebar.c:277
+#: src/nautilus-emblem-sidebar.c:242
 msgid ""
-"This is probably because the emblem is a permanent one, and not one that you "
+"This is probably because the emblem is a permanent one, and not one you "
 "added yourself."
 msgstr "Agian ikur iraunkorra izango da eta ez zuk gehitutakoa."
 
 #
-#: ../src/nautilus-emblem-sidebar.c:243
+#: src/nautilus-emblem-sidebar.c:243
 msgid "Couldn't Remove Emblem"
 msgstr "Ezin izan da ikurra kendu"
 
 #
-#: ../src/nautilus-emblem-sidebar.c:276
+#: src/nautilus-emblem-sidebar.c:276
 #, c-format
 msgid "Couldn't rename emblem with name '%s'."
 msgstr "Ezin izan zaio '%s' izena duen ikurrari izena aldatu."
 
+#: src/nautilus-emblem-sidebar.c:277
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr "Agian ikur iraunkorra izango da eta ez zuk gehitutakoa."
+
 #
-#: ../src/nautilus-emblem-sidebar.c:278
+#: src/nautilus-emblem-sidebar.c:278
 msgid "Couldn't Rename Emblem"
 msgstr "Ezin izan zaio ikurrari izena aldatu"
 
 #
-#: ../src/nautilus-emblem-sidebar.c:297
+#: src/nautilus-emblem-sidebar.c:297
 msgid "Rename Emblem"
 msgstr "Aldatu izena ikurrari"
 
 #
-#: ../src/nautilus-emblem-sidebar.c:316
+#: src/nautilus-emblem-sidebar.c:316
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Idatzi bistaratutako ikurraren izen berria:"
 
-#: ../src/nautilus-emblem-sidebar.c:370
+#: src/nautilus-emblem-sidebar.c:370
 msgid "Rename"
 msgstr "Izena aldatu"
 
 #
-#: ../src/nautilus-emblem-sidebar.c:542
+#: src/nautilus-emblem-sidebar.c:542
 msgid "Add Emblems..."
 msgstr "Gehitu ikurrak..."
 
-#: ../src/nautilus-emblem-sidebar.c:558
+#: src/nautilus-emblem-sidebar.c:558
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -4806,7 +5089,7 @@ msgstr ""
 "Idatzi izen deskriptibo bat ikur bakoitzaren ondoan. Izen hori beste "
 "lekuetan erabiliko da ikurra identifikatzeko."
 
-#: ../src/nautilus-emblem-sidebar.c:560
+#: src/nautilus-emblem-sidebar.c:560
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -4814,153 +5097,152 @@ msgstr ""
 "Idatzi izen deskriptibo bat ikurraren ondoan. Izen hori beste lekuetan "
 "erabiliko da ikurra identifikatzeko."
 
-#: ../src/nautilus-emblem-sidebar.c:779
+#: src/nautilus-emblem-sidebar.c:779
 msgid "Some of the files could not be added as emblems."
 msgstr "Fitxategi batzuk ezin dira ikur gisa gehitu."
 
-#: ../src/nautilus-emblem-sidebar.c:779 ../src/nautilus-emblem-sidebar.c:781
+#: src/nautilus-emblem-sidebar.c:779 src/nautilus-emblem-sidebar.c:781
 msgid "The emblems do not appear to be valid images."
 msgstr "Ikurrak ez dirudite baliozko irudiak."
 
 #
-#: ../src/nautilus-emblem-sidebar.c:779 ../src/nautilus-emblem-sidebar.c:781
+#: src/nautilus-emblem-sidebar.c:779 src/nautilus-emblem-sidebar.c:781
 msgid "Couldn't Add Emblems"
 msgstr "Ezin izan da ikurrik gehitu"
 
-#: ../src/nautilus-emblem-sidebar.c:781
+#: src/nautilus-emblem-sidebar.c:781
 msgid "None of the files could be added as emblems."
 msgstr "Ezin izan da fitxategirik gehitu ikur gisa."
 
-#: ../src/nautilus-emblem-sidebar.c:802 ../src/nautilus-emblem-sidebar.c:827
-#: ../src/nautilus-emblem-sidebar.c:877
+#: src/nautilus-emblem-sidebar.c:802 src/nautilus-emblem-sidebar.c:827
+#: src/nautilus-emblem-sidebar.c:877
 msgid "The emblem cannot be added."
 msgstr "Ezin izan da ikurra gehitu."
 
-#: ../src/nautilus-emblem-sidebar.c:802
+#: src/nautilus-emblem-sidebar.c:802
 msgid "The dragged text was not a valid file location."
 msgstr "Arrastatutako testua ez zen fitxategiaren baliozko helbidea."
 
 #
-#: ../src/nautilus-emblem-sidebar.c:802 ../src/nautilus-emblem-sidebar.c:827
-#: ../src/nautilus-emblem-sidebar.c:877
+#: src/nautilus-emblem-sidebar.c:802 src/nautilus-emblem-sidebar.c:827
+#: src/nautilus-emblem-sidebar.c:877
 msgid "Couldn't Add Emblem"
 msgstr "Ezin izan da ikurra gehitu"
 
-#: ../src/nautilus-emblem-sidebar.c:822 ../src/nautilus-emblem-sidebar.c:876
+#: src/nautilus-emblem-sidebar.c:822 src/nautilus-emblem-sidebar.c:876
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "'%s' fitxategiak ez dirudi baliozko irudia."
 
-#: ../src/nautilus-emblem-sidebar.c:825
+#: src/nautilus-emblem-sidebar.c:825
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Arrastatutako fitxategiak ez dirudi baliozko irudia."
 
-#: ../src/nautilus-emblem-sidebar.c:1051
-msgid "Show Emblems"
-msgstr "Erakutsi ikurrak"
-
-#: ../src/nautilus-file-management-properties.c:307
+#: src/nautilus-file-management-properties.c:307
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../src/nautilus-file-management-properties.glade.h:1
+#: src/nautilus-file-management-properties.glade.h:1
 msgid "    "
 msgstr "    "
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:2
+#: src/nautilus-file-management-properties.glade.h:2
 msgid "1 GB"
 msgstr "1 GB"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:5
+#: src/nautilus-file-management-properties.glade.h:5
 msgid "100 KB"
 msgstr "100 KB"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:21
+#: src/nautilus-file-management-properties.glade.h:21
 msgid "500 KB"
 msgstr "500 KB"
 
-#: ../src/nautilus-file-management-properties.glade.h:24
+#: src/nautilus-file-management-properties.glade.h:24
+#, fuzzy
 msgid "<span weight=\"bold\">Behavior</span>"
 msgstr "<span weight=\"bold\">Portaera</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:25
+#: src/nautilus-file-management-properties.glade.h:25
+#, fuzzy
 msgid "<span weight=\"bold\">Date</span>"
-msgstr "<span weight=\"bold\">Data</span>"
+msgstr "<span weight=\"bold\">Zakarrontzia</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:26
+#: src/nautilus-file-management-properties.glade.h:26
 msgid "<span weight=\"bold\">Default View</span>"
 msgstr "<span weight=\"bold\">Ikuspegi lehenetsia</span>"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:27
+#: src/nautilus-file-management-properties.glade.h:27
 msgid "<span weight=\"bold\">Executable Text Files</span>"
 msgstr "<span weight=\"bold\">Testu-fitxategi exekutagarriak</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:28
+#: src/nautilus-file-management-properties.glade.h:28
 msgid "<span weight=\"bold\">Folders</span>"
 msgstr "<span weight=\"bold\">Karpetak</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:29
+#: src/nautilus-file-management-properties.glade.h:29
 msgid "<span weight=\"bold\">Icon Captions</span>"
 msgstr "<span weight=\"bold\">Ikonoen epigrafeak</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:30
+#: src/nautilus-file-management-properties.glade.h:30
 msgid "<span weight=\"bold\">Icon View Defaults</span>"
 msgstr "<span weight=\"bold\">Ikonoen ikuspegi lehenetsia</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:31
+#: src/nautilus-file-management-properties.glade.h:31
 msgid "<span weight=\"bold\">List Columns</span>"
 msgstr "<span weight=\"bold\">Zutabe-zerrenda</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:32
+#: src/nautilus-file-management-properties.glade.h:32
 msgid "<span weight=\"bold\">List View Defaults</span>"
 msgstr "<span weight=\"bold\">Zerrendaren ikuspegi lehenetsia</span>"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:33
+#: src/nautilus-file-management-properties.glade.h:33
 msgid "<span weight=\"bold\">Other Previewable Files</span>"
 msgstr "<span weight=\"bold\">Bestelako fitxategi aurreikusgarriak</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:34
+#: src/nautilus-file-management-properties.glade.h:34
 msgid "<span weight=\"bold\">Sound Files</span>"
 msgstr "<span weight=\"bold\">Soinu-fitxategiak</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:35
+#: src/nautilus-file-management-properties.glade.h:35
 msgid "<span weight=\"bold\">Text Files</span>"
 msgstr "<span weight=\"bold\">Testu-fitxategiak</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:36
+#: src/nautilus-file-management-properties.glade.h:36
 msgid "<span weight=\"bold\">Trash</span>"
 msgstr "<span weight=\"bold\">Zakarrontzia</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:37
+#: src/nautilus-file-management-properties.glade.h:37
 msgid "<span weight=\"bold\">Tree View Defaults</span>"
 msgstr "<span weight=\"bold\">Zuhaitzaren ikuspegi lehenetsia</span>"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:38
+#: src/nautilus-file-management-properties.glade.h:38
 msgid "Always"
 msgstr "Beti"
 
-#: ../src/nautilus-file-management-properties.glade.h:39
+#: src/nautilus-file-management-properties.glade.h:39
+#, fuzzy
 msgid "Always open in _browser windows"
-msgstr "Ireki beti _arakatze-leihoetan"
+msgstr "ireki arakatze-leihoa."
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:40
+#: src/nautilus-file-management-properties.glade.h:40
 msgid "Ask before _emptying the Trash or deleting files"
 msgstr "Galdetu zakarrontzia _hustu edo fitxategiak ezabatu aurretik"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:41
+#: src/nautilus-file-management-properties.glade.h:41
 msgid "Behavior"
 msgstr "Portaera"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:47
+#: src/nautilus-file-management-properties.glade.h:47
 msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
@@ -4969,194 +5251,199 @@ msgstr ""
 "handiagoarekin informazio gehiago ikusiko da."
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:48
+#: src/nautilus-file-management-properties.glade.h:48
 msgid "Choose the order of information to appear in the list view."
 msgstr "Aukeratu informazioaren ordena zerrendako ikuspegian agertzeko."
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:49
+#: src/nautilus-file-management-properties.glade.h:49
 msgid "Count _number of items:"
 msgstr "_Kontatu elementu-kopurua:"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:50
+#: src/nautilus-file-management-properties.glade.h:50
 msgid "Default _zoom level:"
 msgstr "_Zoom-maila lehenetsia:"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:51
+#: src/nautilus-file-management-properties.glade.h:51
+#, fuzzy
 msgid "Display"
-msgstr "Bistaratu"
+msgstr "_Bistaratu"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:52
+#: src/nautilus-file-management-properties.glade.h:52
 msgid "File Management Preferences"
 msgstr "Fitxategi-kudeaketaren hobespenak"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:53
+#: src/nautilus-file-management-properties.glade.h:53
 msgid "I_nclude a Delete command that bypasses Trash"
 msgstr "_Sartu zakarrontzia saltatuko duen 'Ezabatu' komandoa"
 
-#: ../src/nautilus-file-management-properties.glade.h:55
+#: src/nautilus-file-management-properties.glade.h:55
 msgid "List Columns"
 msgstr "Zutabe-zerrenda"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:57
+#: src/nautilus-file-management-properties.glade.h:57
 msgid "Local Files Only"
 msgstr "Fitxategi lokalak bakarrik"
 
-#: ../src/nautilus-file-management-properties.glade.h:58
+#: src/nautilus-file-management-properties.glade.h:58
 msgid "MIME type"
 msgstr "MIME mota"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:59
+#: src/nautilus-file-management-properties.glade.h:59
 msgid "Never"
 msgstr "Inoiz ez"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:60
+#: src/nautilus-file-management-properties.glade.h:60
 msgid "Preview"
 msgstr "Aurrebista"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:61
+#: src/nautilus-file-management-properties.glade.h:61
 msgid "Preview _sound files:"
 msgstr "_Erakutsi soinu-fitxategien aurrebista:"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:62
+#: src/nautilus-file-management-properties.glade.h:62
 msgid "Show _only folders"
 msgstr "Erakutsi _karpetak bakarrik"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:63
+#: src/nautilus-file-management-properties.glade.h:63
 msgid "Show _thumbnails:"
 msgstr "Erakutsi koadro _txikiak:"
 
-#: ../src/nautilus-file-management-properties.glade.h:64
+#: src/nautilus-file-management-properties.glade.h:64
 msgid "Show hidden and _backup files"
 msgstr "Erakutsi ezkutuko _fitxategiak eta babeskopia-fitxategiak"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:65
+#: src/nautilus-file-management-properties.glade.h:65
 msgid "Show te_xt in icons:"
 msgstr "Erakutsi te_stua ikonoetan:"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:66
+#: src/nautilus-file-management-properties.glade.h:66
 msgid "Sort _folders before files"
 msgstr "A_ntolatu karpetak fitxategiak baino lehen"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:67
+#: src/nautilus-file-management-properties.glade.h:67
 msgid "View _new folders using:"
 msgstr "Karpeta _berriak ikusteko, erabili:"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:68
+#: src/nautilus-file-management-properties.glade.h:68
 msgid "Views"
 msgstr "Ikuspegiak"
 
-#: ../src/nautilus-file-management-properties.glade.h:69
+#: src/nautilus-file-management-properties.glade.h:69
 msgid "_Arrange items:"
 msgstr "_Antolatu elementuak:"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:71
+#: src/nautilus-file-management-properties.glade.h:71
 msgid "_Default zoom level:"
 msgstr "_Zoom-maila lehenetsia:"
 
-#: ../src/nautilus-file-management-properties.glade.h:72
+#: src/nautilus-file-management-properties.glade.h:72
 msgid "_Double click to activate items"
 msgstr "_Egin klik bikoitza elementuak aktibatzeko"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:73
+#: src/nautilus-file-management-properties.glade.h:73
+#, fuzzy
 msgid "_Format:"
-msgstr "_Formatua:"
+msgstr "_Formatua"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:74
+#: src/nautilus-file-management-properties.glade.h:74
 msgid "_Only for files smaller than:"
 msgstr "_Hau baino txikiagoak diren fitxategientzat bakarrik:"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:75
+#: src/nautilus-file-management-properties.glade.h:75
 msgid "_Run executable text files when they are clicked"
 msgstr "Exekutatu _testu-fitxategi exekutagarriak klik egiten zaienean"
 
-#: ../src/nautilus-file-management-properties.glade.h:76
+#: src/nautilus-file-management-properties.glade.h:76
 msgid "_Single click to activate items"
 msgstr "Egin klik _bakarra elementuak aktibatzeko"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:77
+#: src/nautilus-file-management-properties.glade.h:77
 msgid "_Text beside icons"
 msgstr "_Ikono-ondoko testua"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:78
+#: src/nautilus-file-management-properties.glade.h:78
 msgid "_Use compact layout"
 msgstr "Erabili _diseinu trinkoa"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:79
+#: src/nautilus-file-management-properties.glade.h:79
 msgid "_View executable text files when they are clicked"
 msgstr "Ikusi testu-fitxategi e_xekutagarriak klik egiten zaienean"
 
-#: ../src/nautilus-file-management-properties.glade.h:80
+#: src/nautilus-file-management-properties.glade.h:80
 msgid "date accessed"
 msgstr "atzipen-data"
 
-#: ../src/nautilus-file-management-properties.glade.h:81
+#: src/nautilus-file-management-properties.glade.h:81
 msgid "date modified"
 msgstr "aldaketa-data"
 
-#: ../src/nautilus-file-management-properties.glade.h:82
+#: src/nautilus-file-management-properties.glade.h:82
 msgid "group"
 msgstr "taldea"
 
 #
-#: ../src/nautilus-file-management-properties.glade.h:83
+#: src/nautilus-file-management-properties.glade.h:83
+#, fuzzy
 msgid "informal"
-msgstr "informala"
+msgstr "Informazioa"
 
-#: ../src/nautilus-file-management-properties.glade.h:84
+#: src/nautilus-file-management-properties.glade.h:84
+#, fuzzy
 msgid "iso"
-msgstr "iso"
+msgstr "Disko-musika"
 
-#: ../src/nautilus-file-management-properties.glade.h:85
+#: src/nautilus-file-management-properties.glade.h:85
+#, fuzzy
 msgid "locale"
-msgstr "lokala"
+msgstr "Ahots musika"
 
-#: ../src/nautilus-file-management-properties.glade.h:86
+#: src/nautilus-file-management-properties.glade.h:86
 msgid "none"
 msgstr "bat ere ez"
 
-#: ../src/nautilus-file-management-properties.glade.h:87
+#: src/nautilus-file-management-properties.glade.h:87
 msgid "octal permissions"
 msgstr "baimen zortzitarrak"
 
-#: ../src/nautilus-file-management-properties.glade.h:88
+#: src/nautilus-file-management-properties.glade.h:88
 msgid "owner"
 msgstr "jabea"
 
-#: ../src/nautilus-file-management-properties.glade.h:89
+#: src/nautilus-file-management-properties.glade.h:89
 msgid "permissions"
 msgstr "baimenak"
 
-#: ../src/nautilus-file-management-properties.glade.h:90
+#: src/nautilus-file-management-properties.glade.h:90
 msgid "size"
 msgstr "tamaina"
 
-#: ../src/nautilus-file-management-properties.glade.h:91
+#: src/nautilus-file-management-properties.glade.h:91
 msgid "type"
 msgstr "mota"
 
-#: ../src/nautilus-first-time-druid.c:40
+#: src/nautilus-first-time-druid.c:40
 msgid ""
 "Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
@@ -5168,185 +5455,172 @@ msgstr ""
 "\n"
 "Fitxategi hori eskuz ezaba dezakezu laguntzailea berriro aurkezteko.\n"
 
-#: ../src/nautilus-history-sidebar.c:278
+#: src/nautilus-history-sidebar.c:278
 msgid "History"
 msgstr "Historia"
 
-#: ../src/nautilus-history-sidebar.c:284
-msgid "Show History"
-msgstr "Erakutsi historia"
-
 #
-#: ../src/nautilus-image-properties-page.c:219
+#: src/nautilus-image-properties-page.c:219
 msgid "Camera Brand"
 msgstr "Kamera marka"
 
 #
-#: ../src/nautilus-image-properties-page.c:220
+#: src/nautilus-image-properties-page.c:220
 msgid "Camera Model"
 msgstr "Kamera modeloa"
 
-#: ../src/nautilus-image-properties-page.c:221
+#: src/nautilus-image-properties-page.c:221
 msgid "Date Taken"
 msgstr "Argazkiaren data"
 
-#: ../src/nautilus-image-properties-page.c:222
+#: src/nautilus-image-properties-page.c:222
 msgid "Exposure Time"
 msgstr "Esposizio denbora"
 
-#: ../src/nautilus-image-properties-page.c:223
+#: src/nautilus-image-properties-page.c:223
 msgid "Exposure Program"
 msgstr "Esposizio programa"
 
-#: ../src/nautilus-image-properties-page.c:224
+#: src/nautilus-image-properties-page.c:224
 msgid "Aperture Value"
 msgstr "Irekiduraren balioa"
 
-#: ../src/nautilus-image-properties-page.c:225
+#: src/nautilus-image-properties-page.c:225
 msgid "Metering Mode"
 msgstr "Neurtze modua"
 
-#: ../src/nautilus-image-properties-page.c:226
+#: src/nautilus-image-properties-page.c:226
 msgid "Flash Fired"
 msgstr "Flasha-rekin"
 
-#: ../src/nautilus-image-properties-page.c:227
+#: src/nautilus-image-properties-page.c:227
 msgid "Focal Length"
 msgstr "Fokuaren luzera"
 
-#: ../src/nautilus-image-properties-page.c:228
+#: src/nautilus-image-properties-page.c:228
 msgid "Shutter Speed"
 msgstr "Obturadorearen abiadura"
 
-#: ../src/nautilus-image-properties-page.c:229
+#: src/nautilus-image-properties-page.c:229
 msgid "ISO Speed Rating"
 msgstr "ISO abiaduraren tasa"
 
-#: ../src/nautilus-image-properties-page.c:230
+#: src/nautilus-image-properties-page.c:230
 msgid "Software"
 msgstr "Softwarea"
 
-#: ../src/nautilus-image-properties-page.c:249
+#: src/nautilus-image-properties-page.c:249
 #, c-format
-msgid "<b>Image Type:</b> %s (%s)\n"
-msgstr "<b>Irudi-mota:</b> %s (%s)\n"
-
-#: ../src/nautilus-image-properties-page.c:251
-#, c-format
-msgid "<b>Width:</b> %d pixel\n"
-msgid_plural "<b>Width:</b> %d pixels\n"
-msgstr[0] "<b>Zabalera:</b> pixel %d\n"
-msgstr[1] "<b>Zabalera:</b> %d pixel \n"
-
-#: ../src/nautilus-image-properties-page.c:255
-#, c-format
-msgid "<b>Height:</b> %d pixel\n"
-msgid_plural "<b>Height:</b> %d pixels\n"
-msgstr[0] "<b>Altuera:</b> pixel %d\n"
-msgstr[1] "<b>Altuera:</b> %d pixel \n"
+msgid ""
+"<b>Image Type:</b> %s (%s)\n"
+"<b>Resolution:</b> %dx%d pixels\n"
+msgid_plural ""
+"<b>Image Type:</b> %s (%s)\n"
+"<b>Resolution:</b> %dx%d pixels\n"
+msgstr[0] ""
+"<b>Irudi-mota:</b> %s (%s)\n"
+"<b>Bereizmena:</b> %dx%d pixel\n"
+msgstr[1] ""
+"<b>Irudi-mota:</b> %s (%s)\n"
+"<b>Bereizmena:</b> %dx%d pixel\n"
 
-#: ../src/nautilus-image-properties-page.c:270
+#: src/nautilus-image-properties-page.c:264
 msgid "Failed to load image information"
 msgstr "Ezin izan da irudiaren informazioa kargatu"
 
 #
-#: ../src/nautilus-image-properties-page.c:420
+#: src/nautilus-image-properties-page.c:414
 msgid "loading..."
 msgstr "kargatzen..."
 
-#: ../src/nautilus-image-properties-page.c:486
+#: src/nautilus-image-properties-page.c:480
 msgid "Image"
 msgstr "Irudia"
 
 #
-#: ../src/nautilus-information-panel.c:178
+#: src/nautilus-information-panel.c:178
 msgid "Information"
 msgstr "Informazioa"
 
 #
-#: ../src/nautilus-information-panel.c:184
-msgid "Show Information"
-msgstr "Erakutsi informazioa"
-
-#
 #. add the reset background item, possibly disabled
-#: ../src/nautilus-information-panel.c:404
+#: src/nautilus-information-panel.c:397
 msgid "Use _Default Background"
 msgstr "Erabili _atzeko plano lehenetsia"
 
-#: ../src/nautilus-information-panel.c:554
+#: src/nautilus-information-panel.c:547
 msgid "You can't assign more than one custom icon at a time."
 msgstr "Ezin dituzu ikono pertsonalizatu bat baino gehiago batera esleitu."
 
-#: ../src/nautilus-information-panel.c:583
+#: src/nautilus-information-panel.c:576
 msgid "You can only use images as custom icons."
 msgstr "Irudiak bakarrik erabil ditzakezu ikono pertsonal gisa."
 
-#: ../src/nautilus-information-panel.c:898
+#: src/nautilus-information-panel.c:891
 #, c-format
 msgid "Open with %s"
 msgstr "Ireki honekin: %s"
 
-#: ../src/nautilus-information-panel.c:993
+#: src/nautilus-information-panel.c:984
 msgid "Unable to launch the cd burner application."
 msgstr "Ezin da CD grabagailuaren aplikazioa abiarazi."
 
-#: ../src/nautilus-information-panel.c:994
+#: src/nautilus-information-panel.c:985
 msgid "Can't Launch CD Burner"
 msgstr "Ezin da CD grabagailua abiarazi"
 
 #
 #. FIXME: We don't use spaces to pad labels!
-#: ../src/nautilus-information-panel.c:1039
+#: src/nautilus-information-panel.c:1030
 msgid "Empty _Trash"
 msgstr "Hustu _zakarrontzia"
 
 #. FIXME: We don't use spaces to pad labels!
-#: ../src/nautilus-information-panel.c:1055
+#: src/nautilus-information-panel.c:1046
 msgid "_Write contents to CD"
 msgstr "_Idatzi edukia CDan"
 
-#: ../src/nautilus-location-bar.c:61
+#: src/nautilus-location-bar.c:61
 msgid "Go To:"
 msgstr "Joan:"
 
-#: ../src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:154
 #, c-format
 msgid "Do you want to view %d location?"
 msgid_plural "Do you want to view %d locations?"
 msgstr[0] "%d helbide ikusi nahi dituzu?"
 msgstr[1] "%d helbide horiek aparteko leihoetan ikusi nahi dituzu?"
 
-#: ../src/nautilus-location-bar.c:170
+#: src/nautilus-location-bar.c:170
 msgid "View in Multiple Windows?"
 msgstr "Leiho anitzetan ikusi?"
 
-#: ../src/nautilus-location-dialog.c:140
+#: src/nautilus-location-dialog.c:139
 msgid "Open Location"
 msgstr "Ireki helbidea"
 
 #
-#: ../src/nautilus-location-dialog.c:151
+#: src/nautilus-location-dialog.c:150
 msgid "_Location:"
 msgstr "Helbidea:"
 
-#: ../src/nautilus-main.c:269
+#: src/nautilus-main.c:212
 msgid "Perform a quick set of self-check tests."
 msgstr "Burutu auto-egiaztapen proba azkarrak."
 
-#: ../src/nautilus-main.c:272
+#: src/nautilus-main.c:215
 msgid "Create the initial window with the given geometry."
 msgstr "Sortu hasierako leihoa emandako geometriarekin."
 
-#: ../src/nautilus-main.c:272
+#: src/nautilus-main.c:215
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: ../src/nautilus-main.c:274
+#: src/nautilus-main.c:217
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Zehaztutako URIentzat bakarrik sortu leihoak."
 
-#: ../src/nautilus-main.c:276
+#: src/nautilus-main.c:219
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -5354,42 +5628,41 @@ msgstr ""
 "Ez kudeatu mahaigaina (ez egin jaramonik hobespenen elkarrizketa-koadroan "
 "ezarritako hobespenei)."
 
-#: ../src/nautilus-main.c:278
+#: src/nautilus-main.c:221
 msgid "open a browser window."
 msgstr "ireki arakatze-leihoa."
 
-#: ../src/nautilus-main.c:280
+#: src/nautilus-main.c:223
 msgid "Quit Nautilus."
 msgstr "Irten Nautilus-etik."
 
-#: ../src/nautilus-main.c:282
+#: src/nautilus-main.c:225
 msgid "Restart Nautilus."
 msgstr "Berrabiarazi Nautilus."
 
 #
-#: ../src/nautilus-main.c:326
+#: src/nautilus-main.c:258
 msgid "File Manager"
 msgstr "Fitxategi-kudeatzailea"
 
 #. Set initial window title
-#: ../src/nautilus-main.c:332 ../src/nautilus-spatial-window.c:330
-#: ../src/nautilus-window-menus.c:444 ../src/nautilus-window.c:151
+#: src/nautilus-main.c:264 src/nautilus-spatial-window.c:330
+#: src/nautilus-window-menus.c:442 src/nautilus-window.c:147
 msgid "Nautilus"
 msgstr "Nautilus"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:364 ../src/nautilus-main.c:373
-#: ../src/nautilus-main.c:378
-#, c-format
+#: src/nautilus-main.c:287 src/nautilus-main.c:296 src/nautilus-main.c:301
+#, fuzzy, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
-msgstr "nautilus: %s ezin da URIekin erabili.\n"
+msgstr "nautilus: --quit ezin da URIekin erabili.\n"
 
-#: ../src/nautilus-main.c:369
+#: src/nautilus-main.c:292
 #, c-format
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check ezin da beste aukerekin erabili.\n"
 
-#: ../src/nautilus-main.c:383
+#: src/nautilus-main.c:306
 #, c-format
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry ezin da URI bat baino gehiagorekin erabili.\n"
@@ -5397,530 +5670,496 @@ msgstr "nautilus: --geometry ezin da URI bat baino gehiagorekin erabili.\n"
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: ../src/nautilus-navigation-window-menus.c:115
+#: src/nautilus-navigation-window-menus.c:127
 msgid "Are you sure you want to forget history?"
 msgstr "Ziur zaude historia ezabatu nahi duzula?"
 
-#: ../src/nautilus-navigation-window-menus.c:116
+#: src/nautilus-navigation-window-menus.c:128
 msgid "If you do, you will be doomed to repeat it."
 msgstr "Hala egiten baduzu, historia errepikatzera behartuta egongo zara."
 
 #
-#: ../src/nautilus-navigation-window-menus.c:118
+#: src/nautilus-navigation-window-menus.c:130
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Ziur zaude bisitatu dituzun helbideen zerrenda garbitu nahi duzula?"
 
-#: ../src/nautilus-navigation-window-menus.c:120
+#: src/nautilus-navigation-window-menus.c:132
 msgid "If you clear the list of locations, they will be permanently deleted."
 msgstr "Helbideen zerrenda garbitzen baduzu, betirako ezabatuko dira."
 
 #
-#: ../src/nautilus-navigation-window-menus.c:126
+#: src/nautilus-navigation-window-menus.c:138
 msgid "Clear History"
 msgstr "Garbitu historia"
 
-#: ../src/nautilus-navigation-window-menus.c:288
-#: ../src/nautilus-window-bookmarks.c:96
+#: src/nautilus-navigation-window-menus.c:287
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr ""
+"Existitzen ez diren helbideen laster-markak kendu nahi dituzu zerrendatik?"
+
+#: src/nautilus-navigation-window-menus.c:289
 #, c-format
 msgid "The location \"%s\" does not exist."
 msgstr "\"%s\" helbiderik ez dago."
 
-#: ../src/nautilus-navigation-window-menus.c:290
-msgid "The history location doesn't exist."
-msgstr "Historiaren helbidea ez dago."
-
-#: ../src/nautilus-navigation-window-menus.c:292
-#: ../src/nautilus-window-bookmarks.c:99
+#: src/nautilus-navigation-window-menus.c:292
 msgid "Bookmark for Nonexistent Location"
 msgstr "Laster-marka honen helbidea ez dago"
 
-#: ../src/nautilus-navigation-window-menus.c:416
+#: src/nautilus-navigation-window-menus.c:293
+msgid "Remove"
+msgstr "Kendu"
+
+#: src/nautilus-navigation-window-menus.c:539
 msgid "_Go"
 msgstr "_Joan"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:417
+#: src/nautilus-navigation-window-menus.c:540
 msgid "_Bookmarks"
 msgstr "Laster-_markak"
 
 #
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:418
+#: src/nautilus-navigation-window-menus.c:541
 msgid "Open New _Window"
 msgstr "Ireki leiho _berria"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:419
+#: src/nautilus-navigation-window-menus.c:542
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Bistaratutako helbidearentzat beste Nautilus leiho bat irekitzen du"
 
-#: ../src/nautilus-navigation-window-menus.c:421
+#: src/nautilus-navigation-window-menus.c:544
 msgid "Close _All Windows"
 msgstr "Itxi leiho _guztiak"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:422
+#: src/nautilus-navigation-window-menus.c:545
 msgid "Close all Navigation windows"
 msgstr "Itxi nabigazioko leiho guztiak"
 
-#: ../src/nautilus-navigation-window-menus.c:424
+#: src/nautilus-navigation-window-menus.c:547
 msgid "_Location..."
 msgstr "_Helbidea..."
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:425
-#: ../src/nautilus-spatial-window.c:730
+#: src/nautilus-navigation-window-menus.c:548
+#: src/nautilus-spatial-window.c:582
 msgid "Specify a location to open"
-msgstr "Zehaztu helbidea irekitzeko"
+msgstr ""
 
 #
-#: ../src/nautilus-navigation-window-menus.c:427
+#: src/nautilus-navigation-window-menus.c:550
+#, fuzzy
 msgid "Clea_r History"
-msgstr "_Garbitu historia"
+msgstr "Garbitu historia"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:551
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr "Joan menuaren eta Atzera/Aurrera zerrenden edukia garbitzen du"
 
-#: ../src/nautilus-navigation-window-menus.c:430
-#: ../src/nautilus-spatial-window.c:738
+#: src/nautilus-navigation-window-menus.c:553
 msgid "_Add Bookmark"
 msgstr "_Gehitu laster-marka"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:431
-#: ../src/nautilus-spatial-window.c:739
+#: src/nautilus-navigation-window-menus.c:554
 msgid "Add a bookmark for the current location to this menu"
 msgstr "Menu honetan uneko helbidearen laster-marka gehitzen du"
 
 #
-#: ../src/nautilus-navigation-window-menus.c:433
-#: ../src/nautilus-spatial-window.c:741
+#: src/nautilus-navigation-window-menus.c:556
 msgid "_Edit Bookmarks"
 msgstr "Editatu la_ster-markak"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:434
-#: ../src/nautilus-spatial-window.c:742
+#: src/nautilus-navigation-window-menus.c:557
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Menu honetako laster-markak editatzeko leihoa bistaratzen du"
 
 #
 #. name, stock id
-#: ../src/nautilus-navigation-window-menus.c:440
-msgid "_Main Toolbar"
-msgstr "Tresna-barra _nagusia"
-
-#. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:441
-msgid "Change the visibility of this window's main toolbar"
-msgstr "Aldatu leiho honetako tresna-barra nagusiaren ikusgaitasuna"
-
-#
-#. is_active
-#. name, stock id
-#: ../src/nautilus-navigation-window-menus.c:445
+#: src/nautilus-navigation-window-menus.c:563
 msgid "_Side Pane"
 msgstr "Albo-_panela"
 
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:446
+#: src/nautilus-navigation-window-menus.c:564
 msgid "Change the visibility of this window's sidebar"
 msgstr "Leiho honetako alboko barra erakusten/ezkutatzen du"
 
 #
 #. is_active
 #. name, stock id
-#: ../src/nautilus-navigation-window-menus.c:450
+#: src/nautilus-navigation-window-menus.c:568
 msgid "Location _Bar"
 msgstr "_Helbide-barra"
 
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:451
+#: src/nautilus-navigation-window-menus.c:569
 msgid "Change the visibility of this window's location bar"
 msgstr "Leiho honetako helbide-barra erakusten/ezkutatzen du"
 
 #
 #. is_active
 #. name, stock id
-#: ../src/nautilus-navigation-window-menus.c:455
+#: src/nautilus-navigation-window-menus.c:573
 msgid "St_atusbar"
 msgstr "Egoera-ba_rra"
 
 #
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:456
+#: src/nautilus-navigation-window-menus.c:574
 msgid "Change the visibility of this window's statusbar"
 msgstr "Leiho honetako egoera-barra erakusten/ezkutatzen du"
 
-#: ../src/nautilus-navigation-window-menus.c:480
+#: src/nautilus-navigation-window-menus.c:598
 msgid "_Back"
 msgstr "_Atzera"
 
-#: ../src/nautilus-navigation-window-menus.c:482
+#: src/nautilus-navigation-window-menus.c:600
 msgid "Go to the previous visited location"
 msgstr "Bisitatutako aurreko helbidera joaten da"
 
-#
-#: ../src/nautilus-navigation-window-menus.c:483
-msgid "Back history"
-msgstr "Atzera joan historian"
-
-#: ../src/nautilus-navigation-window-menus.c:497
+#: src/nautilus-navigation-window-menus.c:614
 msgid "_Forward"
 msgstr "A_urrera"
 
-#: ../src/nautilus-navigation-window-menus.c:499
+#: src/nautilus-navigation-window-menus.c:616
 msgid "Go to the next visited location"
 msgstr "Bisitatutako hurrengo helbidera joaten da"
 
-#
-#: ../src/nautilus-navigation-window-menus.c:500
-msgid "Forward history"
-msgstr "Aurrera joan historian"
+#: src/nautilus-navigation-window.c:613 src/nautilus-window.c:654
+#, c-format
+msgid "View as %s"
+msgstr "Ikusi honela: %s"
 
 #
-#: ../src/nautilus-navigation-window.c:793
-#, c-format
+#: src/nautilus-navigation-window.c:689
+#, fuzzy, c-format
 msgid "%s - File Browser"
-msgstr "%s - fitxategi-arakatzailea"
+msgstr "Fitxategi arakatzailea: %s"
 
-#: ../src/nautilus-notes-viewer.c:388 ../src/nautilus-notes-viewer.c:498
+#: src/nautilus-notes-viewer.c:388 src/nautilus-notes-viewer.c:495
 msgid "Notes"
 msgstr "Oharrak"
 
-#: ../src/nautilus-notes-viewer.c:394
-msgid "Show Notes"
-msgstr "Erakutsi oharrak"
-
-#: ../src/nautilus-pathbar.c:1128 ../src/nautilus-places-sidebar.c:152
-msgid "Home"
-msgstr "Etxera"
-
-#
-#: ../src/nautilus-places-sidebar.c:474
-msgid "Places"
-msgstr "Lekuak"
-
-#
-#: ../src/nautilus-places-sidebar.c:480
-msgid "Show Places"
-msgstr "Erakutsi lekuak"
-
 #. set the title and standard close accelerator
-#: ../src/nautilus-property-browser.c:278
+#: src/nautilus-property-browser.c:270
 msgid "Backgrounds and Emblems"
 msgstr "Atzeko planoak eta ikurrak"
 
 #
-#: ../src/nautilus-property-browser.c:387
+#: src/nautilus-property-browser.c:379
 msgid "_Remove..."
 msgstr "_Kendu..."
 
 #
-#: ../src/nautilus-property-browser.c:407
+#: src/nautilus-property-browser.c:399
 msgid "_Add new..."
 msgstr "_Gehitu berria..."
 
-#: ../src/nautilus-property-browser.c:960
+#: src/nautilus-property-browser.c:905
 #, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "%s eredua ezin izan da ezabatu."
 
-#: ../src/nautilus-property-browser.c:961
+#: src/nautilus-property-browser.c:906
 msgid "Check that you have permission to delete the pattern."
 msgstr "Egiaztatu eredua ezabatzeko baimena duzula."
 
-#: ../src/nautilus-property-browser.c:962
+#: src/nautilus-property-browser.c:907
 msgid "Couldn't Delete Pattern"
 msgstr "Ezin izan da eredua ezabatu"
 
-#: ../src/nautilus-property-browser.c:990
+#: src/nautilus-property-browser.c:935
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "%s ikurra ezin izan da ezabatu."
 
-#: ../src/nautilus-property-browser.c:991
+#: src/nautilus-property-browser.c:936
 msgid "Check that you have permission to delete the emblem."
 msgstr "Egiaztatu ikurra ezabatzeko baimena duzula"
 
 #
-#: ../src/nautilus-property-browser.c:992
+#: src/nautilus-property-browser.c:937
 msgid "Couldn't Delete Emblem"
 msgstr "Ezin izan zaio ikurra ezabatu"
 
-#: ../src/nautilus-property-browser.c:1030
+#: src/nautilus-property-browser.c:975
 msgid "Create a New Emblem:"
 msgstr "Sortu ikur berria:"
 
 #
 #. make the keyword label and field
-#: ../src/nautilus-property-browser.c:1043
+#: src/nautilus-property-browser.c:988
 msgid "_Keyword:"
 msgstr "_Gako-hitza:"
 
 #
 #. set up a gnome icon entry to pick the image file
-#: ../src/nautilus-property-browser.c:1061
+#: src/nautilus-property-browser.c:1006
 msgid "_Image:"
 msgstr "_Irudia:"
 
-#: ../src/nautilus-property-browser.c:1065
+#: src/nautilus-property-browser.c:1010
 msgid "Select an image file for the new emblem:"
 msgstr "Hautatu irudi-fitxategi bat ikur berriarentzat:"
 
-#: ../src/nautilus-property-browser.c:1089
+#: src/nautilus-property-browser.c:1034
 msgid "Create a New Color:"
 msgstr "Sortu kolore berria:"
 
 #
 #. make the name label and field
-#: ../src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1048
 msgid "Color _name:"
 msgstr "Kolorearen i_zena:"
 
 #
-#: ../src/nautilus-property-browser.c:1119
+#: src/nautilus-property-browser.c:1064
 msgid "Color _value:"
 msgstr "Ko_lore-balioa:"
 
-#: ../src/nautilus-property-browser.c:1151
+#: src/nautilus-property-browser.c:1096
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" ez da baliozko fitxategi-izena."
 
-#: ../src/nautilus-property-browser.c:1154
+#: src/nautilus-property-browser.c:1099
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Eman duzun fitxategi-izena ez da baliozkoa."
 
-#: ../src/nautilus-property-browser.c:1155
+#: src/nautilus-property-browser.c:1100
 msgid "Please try again."
 msgstr "Saiatu berriro."
 
-#: ../src/nautilus-property-browser.c:1157
-#: ../src/nautilus-property-browser.c:1202
+#: src/nautilus-property-browser.c:1102 src/nautilus-property-browser.c:1147
 msgid "Couldn't Install Pattern"
 msgstr "Ezin izan da eredua instalatu"
 
-#: ../src/nautilus-property-browser.c:1168
+#: src/nautilus-property-browser.c:1113
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Ezin duzu berrezartzeko irudia ordeztu."
 
-#: ../src/nautilus-property-browser.c:1169
+#: src/nautilus-property-browser.c:1114
 msgid "Reset is a special image that cannot be deleted."
 msgstr "Berrezarri irudi berezi bat da, eta ezin da ezabatu."
 
-#: ../src/nautilus-property-browser.c:1170
-#: ../src/nautilus-property-browser.c:1396
-#: ../src/nautilus-property-browser.c:1412
+#: src/nautilus-property-browser.c:1115 src/nautilus-property-browser.c:1319
+#: src/nautilus-property-browser.c:1335
 msgid "Not an Image"
 msgstr "Ez da irudia"
 
-#: ../src/nautilus-property-browser.c:1201
+#: src/nautilus-property-browser.c:1146
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "%s eredua ezin izan da instalatu."
 
 #
-#: ../src/nautilus-property-browser.c:1221
+#: src/nautilus-property-browser.c:1166
 msgid "Select an image file to add as a pattern"
 msgstr "Hautatu eredu gisa gehitu nahi duzun irudi-fitxategia"
 
-#: ../src/nautilus-property-browser.c:1273
-#: ../src/nautilus-property-browser.c:1304
+#: src/nautilus-property-browser.c:1227
 msgid "The color cannot be installed."
 msgstr "Ezin izan da kolorea instalatu."
 
-#: ../src/nautilus-property-browser.c:1274
-msgid "Sorry, but you must specify an unused color name for the new color."
-msgstr "Erabili gabeko kolore-izena zehaztu behar duzu kolore berriarentzako."
+#: src/nautilus-property-browser.c:1228
+msgid "Sorry, but you must specify a non-blank name for the new color."
+msgstr "Kolore berriaren izena ezin duzu hutsik utzi."
 
-#: ../src/nautilus-property-browser.c:1275
-#: ../src/nautilus-property-browser.c:1306
+#: src/nautilus-property-browser.c:1229
 msgid "Couldn't Install Color"
 msgstr "Ezin izan da kolorea instalatu"
 
-#: ../src/nautilus-property-browser.c:1305
-msgid "Sorry, but you must specify a non-blank name for the new color."
-msgstr "Kolore berriaren izena ezin duzu hutsik utzi."
-
 #
-#: ../src/nautilus-property-browser.c:1358
+#: src/nautilus-property-browser.c:1281
 msgid "Select a color to add"
 msgstr "Hautatu gehitu nahi duzun kolorea"
 
-#: ../src/nautilus-property-browser.c:1395
-#: ../src/nautilus-property-browser.c:1411
+#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
 #, c-format
 msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "'%s' ez da irudi-fitxategi erabilgarria."
 
-#: ../src/nautilus-property-browser.c:1396
-#: ../src/nautilus-property-browser.c:1412
+#: src/nautilus-property-browser.c:1319 src/nautilus-property-browser.c:1335
 msgid "The file is not an image."
 msgstr "Fitxategia ez da irudi bat."
 
 #
-#: ../src/nautilus-property-browser.c:2089
+#: src/nautilus-property-browser.c:2040
 msgid "Select a Category:"
 msgstr "Hautatu kategoria bat:"
 
 #
-#: ../src/nautilus-property-browser.c:2098
+#: src/nautilus-property-browser.c:2049
 msgid "C_ancel Remove"
 msgstr "_Utzi kentzea bertan behera"
 
 #
-#: ../src/nautilus-property-browser.c:2104
+#: src/nautilus-property-browser.c:2055
 msgid "_Add a New Pattern..."
 msgstr "Gehitu e_redu berria..."
 
 #
-#: ../src/nautilus-property-browser.c:2107
+#: src/nautilus-property-browser.c:2058
 msgid "_Add a New Color..."
 msgstr "Gehitu kol_ore berria..."
 
 #
-#: ../src/nautilus-property-browser.c:2110
+#: src/nautilus-property-browser.c:2061
 msgid "_Add a New Emblem..."
 msgstr "Gehitu iku_r berria..."
 
-#: ../src/nautilus-property-browser.c:2133
+#: src/nautilus-property-browser.c:2084
 msgid "Click on a pattern to remove it"
 msgstr "Egin klik kendu nahi duzun ereduan"
 
-#: ../src/nautilus-property-browser.c:2136
+#: src/nautilus-property-browser.c:2087
 msgid "Click on a color to remove it"
 msgstr "Egin klik kendu nahi duzun kolorean"
 
-#: ../src/nautilus-property-browser.c:2139
+#: src/nautilus-property-browser.c:2090
 msgid "Click on an emblem to remove it"
 msgstr "Egin klik kendu nahi duzun ikurrean"
 
-#: ../src/nautilus-property-browser.c:2148
+#: src/nautilus-property-browser.c:2099
 msgid "Patterns:"
 msgstr "Ereduak:"
 
-#: ../src/nautilus-property-browser.c:2151
+#: src/nautilus-property-browser.c:2102
 msgid "Colors:"
 msgstr "Koloreak:"
 
-#: ../src/nautilus-property-browser.c:2154
+#: src/nautilus-property-browser.c:2105
 msgid "Emblems:"
 msgstr "Ikurrak:"
 
 #
-#: ../src/nautilus-property-browser.c:2174
+#: src/nautilus-property-browser.c:2125
 msgid "_Remove a Pattern..."
 msgstr "_Kendu eredu bat..."
 
 #
-#: ../src/nautilus-property-browser.c:2177
+#: src/nautilus-property-browser.c:2128
 msgid "_Remove a Color..."
 msgstr "Ke_ndu kolore bat..."
 
 #
-#: ../src/nautilus-property-browser.c:2180
+#: src/nautilus-property-browser.c:2131
 msgid "_Remove an Emblem..."
 msgstr "Kendu ik_ur bat..."
 
 #
-#: ../src/nautilus-side-pane.c:427
+#: src/nautilus-side-pane.c:425
 msgid "Close the side pane"
 msgstr "Itxi albo-panela"
 
+#: src/nautilus-side-pane.c:596
+#, c-format
+msgid "Show %s"
+msgstr "Erakutsi %s"
+
 #
-#: ../src/nautilus-spatial-window.c:728
+#: src/nautilus-spatial-window.c:580
 msgid "_Places"
 msgstr "_Lekuak"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:729
+#: src/nautilus-spatial-window.c:581
 msgid "Open _Location..."
 msgstr "Ireki _helbidea..."
 
 #
-#: ../src/nautilus-spatial-window.c:732
+#: src/nautilus-spatial-window.c:584
 msgid "Close P_arent Folders"
 msgstr "Itxi karpeta g_urasoa"
 
 #
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:733
+#: src/nautilus-spatial-window.c:585
 msgid "Close this folder's parents"
 msgstr "Itxi karpeta honen gurasoak"
 
 #
-#: ../src/nautilus-spatial-window.c:735
+#: src/nautilus-spatial-window.c:587
+#, fuzzy
 msgid "Clos_e All Folders"
-msgstr "_Itxi karpeta guztiak"
+msgstr "Itxi karpeta g_urasoa"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:736
+#: src/nautilus-spatial-window.c:588
+#, fuzzy
 msgid "Close all folder windows"
-msgstr "Itxi karpeten leiho guztiak"
+msgstr "Itxi nabigazioko leiho guztiak"
 
-#: ../src/nautilus-throbber.c:514
+#: src/nautilus-throbber.c:514
 msgid "throbber"
 msgstr "taupada"
 
-#: ../src/nautilus-throbber.c:515
+#: src/nautilus-throbber.c:515
 msgid "provides visual status"
 msgstr "egoera bisualki adierazten du"
 
-#: ../src/nautilus-window-bookmarks.c:94
-msgid ""
-"Do you want to remove any bookmarks with the non-existing location from your "
-"list?"
-msgstr ""
-"Existitzen ez diren helbideen laster-markak kendu nahi dituzu zerrendatik?"
+#: src/nautilus-window-manage-views.c:575
+msgid "View Failed"
+msgstr "Ikuspegiak huts egin du"
 
-#: ../src/nautilus-window-bookmarks.c:100
-msgid "Remove"
-msgstr "Kendu"
+#: src/nautilus-window-manage-views.c:586
+#, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s ikuspegiak errorea aurkitu du eta ezin du jarraitu."
 
-#: ../src/nautilus-window-manage-views.c:599
+#: src/nautilus-window-manage-views.c:587
 msgid "You can choose another view or go to a different location."
 msgstr "Aukeratu beste ikuspegi bat edo joan beste helbide batera."
 
-#: ../src/nautilus-window-manage-views.c:600
-#: ../src/nautilus-window-manage-views.c:614
-msgid "View Failed"
-msgstr "Ikuspegiak huts egin du"
+#: src/nautilus-window-manage-views.c:597
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr "%s ikuspegiak errorea aurkitu du abiaraztean."
 
-#: ../src/nautilus-window-manage-views.c:613
+#: src/nautilus-window-manage-views.c:598
 msgid "The location cannot be displayed with this viewer."
 msgstr "Ikustaile honekin ezin da helbidea bistaratu."
 
 #
-#: ../src/nautilus-window-manage-views.c:1003
+#: src/nautilus-window-manage-views.c:985
 msgid "Content View"
 msgstr "Eduki-ikuspegia"
 
 #
-#: ../src/nautilus-window-manage-views.c:1004
+#: src/nautilus-window-manage-views.c:986
+#, fuzzy
 msgid "View of the current folder"
-msgstr "Ikusi uneko karpeta"
+msgstr "Uneko fitxategiaren edo karpetaren ikuspegia"
 
-#: ../src/nautilus-window-manage-views.c:1361
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
 msgid "Nautilus has no installed viewer capable of displaying the folder."
-msgstr "Nautilus-ek ez du karpeta bistaratzeko gauza den ikustailerik instalatuta."
+msgstr ""
+"Nautilus-ek ez du fitxategia bistaratzeko gauza den ikustailerik instalatuta."
 
-#: ../src/nautilus-window-manage-views.c:1367
+#: src/nautilus-window-manage-views.c:1353
+#, fuzzy
 msgid "The location is not a folder."
-msgstr "Helbidea ez da karpeta."
+msgstr "\"%s\" helbiderik ez dago."
 
-#: ../src/nautilus-window-manage-views.c:1394
+#: src/nautilus-window-manage-views.c:1380
 #, c-format
 msgid "Nautilus cannot handle %s: locations."
 msgstr "Nautilus-ek ezin du %s: helbiderik kudeatu."
 
-#: ../src/nautilus-window-manage-views.c:1429
+#: src/nautilus-window-manage-views.c:1415
 msgid "Check that your proxy settings are correct."
 msgstr "Egiaztatu zure proxy-ezarpenak zuzenak direla."
 
-#: ../src/nautilus-window-manage-views.c:1434
+#: src/nautilus-window-manage-views.c:1420
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
@@ -5929,58 +6168,48 @@ msgstr ""
 "Ezin izan da \"%s\" bistaratu, Nautilus-ek ezin duelako SMB maisuarekin "
 "kontaktatu."
 
-#: ../src/nautilus-window-manage-views.c:1437
+#: src/nautilus-window-manage-views.c:1423
 msgid "Check that an SMB server is running in the local network."
 msgstr "Egiaztatu SMB zerbitzaria sare lokalean exekutatzen ari dela."
 
-#: ../src/nautilus-window-manage-views.c:1442
+#: src/nautilus-window-manage-views.c:1428
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus-ek ezin du \"%s\" bistaratu."
 
-#: ../src/nautilus-window-manage-views.c:1444
+#: src/nautilus-window-manage-views.c:1430
 msgid "Please select another viewer and try again."
 msgstr "Hautatu beste ikustaile bat eta saiatu berriro."
 
-#: ../src/nautilus-window-menus.c:177
+#: src/nautilus-window-menus.c:175
 msgid "Go to the location specified by this bookmark"
 msgstr "Laster-marka honek zehaztutako helbidera joaten da"
 
-#: ../src/nautilus-window-menus.c:409
+#: src/nautilus-window-menus.c:407
 msgid ""
 "Nautilus is free software; you can redistribute it and/or modify \n"
 "it under the terms of the GNU General Public License as published by \n"
 "the Free Software Foundation; either version 2 of the License, or \n"
 "(at your option) any later version."
 msgstr ""
-"Nautilus software librea da; birbana eta/edo alda dezakezu Software "
-"Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, "
-"edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero."
 
-#: ../src/nautilus-window-menus.c:413
+#: src/nautilus-window-menus.c:411
 msgid ""
 "Nautilus is distributed in the hope that it will be useful, \n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of \n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the \n"
 "GNU General Public License for more details."
 msgstr ""
-"Nautilus erabilgarria izango delakoan banatzen da, baina, INOLAKO "
-"BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA "
-"MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago "
-"nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra."
 
-#: ../src/nautilus-window-menus.c:417
+#: src/nautilus-window-menus.c:415
 msgid ""
 "You should have received a copy of the GNU General Public License \n"
 "along with Nautilus; if not, write to the Free Software Foundation, Inc., \n"
 "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
-"Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat jasoko "
-"zenuen; hala ez bada, idatzi hona: Free SoftwareFoundation, Inc., 59 Temple "
-"Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #
-#: ../src/nautilus-window-menus.c:446
+#: src/nautilus-window-menus.c:444
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -5988,51 +6217,52 @@ msgstr ""
 "Nautilus GNOMEren shell grafikoa da, zure fitxategiak eta sistema osoa erraz "
 "kudeatzeko prestatua."
 
-#: ../src/nautilus-window-menus.c:450
+#: src/nautilus-window-menus.c:448
 msgid "Copyright © 1999-2005 The Nautilus authors"
-msgstr "Copyright © 1999-2005 Nautilus-en egileak"
+msgstr ""
 
-#: ../src/nautilus-window-menus.c:455
+#: src/nautilus-window-menus.c:453
+#, fuzzy
 msgid "translator-credits"
 msgstr ""
-"Hizkuntza Politikarako Sailburuordetza (<hizkpol@ej-gv."
+"Euskarazko itzulpena: Hizkuntza Politikarako Sailburuordetza (<hizkpol@ej-gv."
 "es>)"
 
-#: ../src/nautilus-window-menus.c:595
+#: src/nautilus-window-menus.c:590
 msgid "_File"
 msgstr "_Fitxategia"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:596
+#: src/nautilus-window-menus.c:591
 msgid "_Edit"
 msgstr "_Editatu"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:597
+#: src/nautilus-window-menus.c:592
 msgid "_View"
 msgstr "_Ikusi"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:598
+#: src/nautilus-window-menus.c:593
 msgid "_Help"
 msgstr "L_aguntza"
 
 #. name, stock id, label
 #. name, stock id
-#: ../src/nautilus-window-menus.c:600
+#: src/nautilus-window-menus.c:595
 msgid "_Close"
 msgstr "_Itxi"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:601
+#: src/nautilus-window-menus.c:596
 msgid "Close this folder"
 msgstr "Itxi karpeta hau"
 
-#: ../src/nautilus-window-menus.c:604
+#: src/nautilus-window-menus.c:599
 msgid "_Backgrounds and Emblems..."
 msgstr "_Atzeko planoak eta ikurrak..."
 
-#: ../src/nautilus-window-menus.c:605
+#: src/nautilus-window-menus.c:600
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -6041,201 +6271,4577 @@ msgstr ""
 "bistaratzen ditu"
 
 #
-#: ../src/nautilus-window-menus.c:608
+#: src/nautilus-window-menus.c:603
 msgid "Prefere_nces"
 msgstr "Hobes_penak"
 
 #
-#: ../src/nautilus-window-menus.c:609
+#: src/nautilus-window-menus.c:604
 msgid "Edit Nautilus preferences"
 msgstr "Nautilus-en hobespenak editatzen ditu"
 
-#: ../src/nautilus-window-menus.c:611
+#: src/nautilus-window-menus.c:606
 msgid "_Undo"
 msgstr "D_esegin"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:612
+#: src/nautilus-window-menus.c:607
 msgid "Undo the last text change"
 msgstr "Desegin azken testu-aldaketa"
 
 #
-#: ../src/nautilus-window-menus.c:614
+#: src/nautilus-window-menus.c:609
 msgid "Open _Parent"
 msgstr "Ireki g_urasoa"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:615
+#: src/nautilus-window-menus.c:610
 msgid "Open the parent folder"
 msgstr "Ireki karpeta gurasoa"
 
 #
 #. name, stock id
-#: ../src/nautilus-window-menus.c:621
+#: src/nautilus-window-menus.c:616
 msgid "_Stop"
 msgstr "_Gelditu"
 
 #
 #. name, stock id
-#: ../src/nautilus-window-menus.c:625
+#: src/nautilus-window-menus.c:620
 msgid "_Reload"
 msgstr "_Berritu"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:629
+#: src/nautilus-window-menus.c:624
 msgid "_Contents"
 msgstr "_Edukia"
 
 #
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:630
+#: src/nautilus-window-menus.c:625
 msgid "Display Nautilus help"
 msgstr "Nautilus-en laguntza bistaratzen du"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:633
+#: src/nautilus-window-menus.c:628
 msgid "_About"
 msgstr "Honi _buruz"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:634
+#: src/nautilus-window-menus.c:629
 msgid "Display credits for the creators of Nautilus"
 msgstr "Nautilus-en sortzaileen kredituak bistaratzen ditu"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:637
+#: src/nautilus-window-menus.c:632
 msgid "Zoom _In"
 msgstr "_Zooma handiagotu"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:638 ../src/nautilus-zoom-control.c:96
+#: src/nautilus-window-menus.c:633 src/nautilus-zoom-control.c:97
 msgid "Show the contents in more detail"
 msgstr "Edukia xehetasun handiagoarekin erakusten du"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:649
+#: src/nautilus-window-menus.c:636
 msgid "Zoom _Out"
 msgstr "Zooma t_xikiagotu"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:650 ../src/nautilus-zoom-control.c:97
+#: src/nautilus-window-menus.c:637 src/nautilus-zoom-control.c:98
 msgid "Show the contents in less detail"
 msgstr "Edukia xehetasun gutxiagorekin erakusten du"
 
 #
 #. name, stock id
-#: ../src/nautilus-window-menus.c:657
+#: src/nautilus-window-menus.c:640
 msgid "Normal Si_ze"
 msgstr "Ta_maina normala"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:658
+#: src/nautilus-window-menus.c:641
 msgid "Show the contents at the normal size"
 msgstr "Edukia tamaina normalean erakusten du"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:661
+#: src/nautilus-window-menus.c:644
 msgid "Connect to _Server..."
 msgstr "Konektatu _zerbitzarira..."
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:662
+#: src/nautilus-window-menus.c:645
 msgid "Set up a connection to a network server"
-msgstr "Konfiguratu konexioa sareko zerbitzarira"
+msgstr ""
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:665
+#: src/nautilus-window-menus.c:648
 msgid "_Home"
 msgstr "_Etxera"
 
 #
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:666
+#: src/nautilus-window-menus.c:649
+#, fuzzy
 msgid "Go to the home folder"
-msgstr "Joan etxeko karpetara"
+msgstr "Zakarrontziaren karpetara joaten da"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:669
+#: src/nautilus-window-menus.c:652
 msgid "_Computer"
 msgstr "_Ordenagailua"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:670
+#: src/nautilus-window-menus.c:653
+#, fuzzy
 msgid "Go to the computer location"
-msgstr "Joan ordenagailuaren helbidera"
+msgstr "Etxeko helbidera joaten da"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:673
+#: src/nautilus-window-menus.c:656
+#, fuzzy
 msgid "T_emplates"
 msgstr "_Txantiloiak"
 
 #
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:674
+#: src/nautilus-window-menus.c:657
+#, fuzzy
 msgid "Go to the templates folder"
 msgstr "Joan txantiloien karpetara"
 
 #
 #. name, stock id
-#: ../src/nautilus-window-menus.c:677
+#: src/nautilus-window-menus.c:660
 msgid "_Trash"
 msgstr "_Zakarrontzia"
 
 #
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:678
+#: src/nautilus-window-menus.c:661
 msgid "Go to the trash folder"
 msgstr "Zakarrontziaren karpetara joaten da"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:681
+#: src/nautilus-window-menus.c:664
+#, fuzzy
 msgid "CD/_DVD Creator"
-msgstr "CD/_DVD sortzailea"
+msgstr "CD sortzailea"
 
 #
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:682
+#: src/nautilus-window-menus.c:665
+#, fuzzy
 msgid "Go to the CD/DVD Creator"
-msgstr "Joan CD/DVD sortzailera"
+msgstr "Joan CD sortzailera"
 
 #
-#: ../src/nautilus-window-menus.c:708
+#: src/nautilus-window-menus.c:691
 msgid "_Up"
 msgstr "_Gora"
 
-#: ../src/nautilus-zoom-control.c:84
+#: src/nautilus-window.c:655
+#, c-format
+msgid "Display this location with \"%s\""
+msgstr "Bistaratu helbidea honekin: \"%s\""
+
+#
+#: src/nautilus-window.c:1452
+msgid "Application"
+msgstr "Aplikazioa"
+
+#: src/nautilus-window.c:1453
+msgid "The NautilusApplication associated with this window."
+msgstr "Leiho honekin lotutako Nautilus aplikazioa."
+
+#: src/nautilus-zoom-control.c:85
 msgid "Zoom In"
 msgstr "Zooma handiagotu"
 
-#: ../src/nautilus-zoom-control.c:85
+#: src/nautilus-zoom-control.c:86
 msgid "Zoom Out"
 msgstr "Zooma txikiagotu"
 
 #
-#: ../src/nautilus-zoom-control.c:86
+#: src/nautilus-zoom-control.c:87
+#, fuzzy
 msgid "Zoom to Default"
-msgstr "Handitu lehenetsirarte"
+msgstr "Doitzeko zooma"
 
-#: ../src/nautilus-zoom-control.c:98
+#: src/nautilus-zoom-control.c:99
+#, fuzzy
 msgid "Show in the default detail level"
-msgstr "Erakutsi xehetasun-maila lehenetsian"
+msgstr "Zoom-maila lehenetsiaren letra-tamaina:"
 
 #
-#: ../src/nautilus-zoom-control.c:801
+#: src/nautilus-zoom-control.c:802
 msgid "Zoom"
 msgstr "Zooma"
 
-#: ../src/nautilus-zoom-control.c:807
+#: src/nautilus-zoom-control.c:808
 msgid "Set the zoom level of the current view"
 msgstr "Ezarri uneko ikuspegiaren zoom-maila"
 
 #
-#: ../src/network-scheme.desktop.in.h:1
+#: src/network-scheme.desktop.in.h:1
 msgid "Network Servers"
 msgstr "Sareko zerbitzariak"
 
 #
-#: ../src/network-scheme.desktop.in.h:2
+#: src/network-scheme.desktop.in.h:2
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Ikusi zure sareko zerbitzariak Nautilus fitxategi-kudeatzailean"
 
+#~ msgid "Allaire"
+#~ msgstr "Allaire"
+
+#~ msgid "Binary Freedom"
+#~ msgstr "Binary Freedom"
+
+#~ msgid "Borland"
+#~ msgstr "Borland"
+
+#~ msgid "CNET Computers.com"
+#~ msgstr "CNET Computers.com"
+
+#~ msgid "CNET Linux Center"
+#~ msgstr "CNET Linux Center"
+
+#~ msgid "CollabNet"
+#~ msgstr "CollabNet"
+
+#~ msgid "Compaq"
+#~ msgstr "Compaq"
+
+#~ msgid "Conectiva"
+#~ msgstr "Conectiva"
+
+#~ msgid "Covalent"
+#~ msgstr "Covalent"
+
+#~ msgid "Debian.org"
+#~ msgstr "Debian.org"
+
+#~ msgid "Dell"
+#~ msgstr "Dell"
+
+#~ msgid "Freshmeat.net"
+#~ msgstr "Freshmeat.net"
+
+#~ msgid "GNOME.org"
+#~ msgstr "GNOME.org"
+
+#~ msgid "GNU.org"
+#~ msgstr "GNU.org"
+
+#~ msgid "Hardware"
+#~ msgstr "Hardwarea"
+
+#~ msgid "International"
+#~ msgstr "Nazioartekoa"
+
+#~ msgid "Linux Documentation Project"
+#~ msgstr "Linux-en dokumentazio-proiektua"
+
+#~ msgid "Linux One"
+#~ msgstr "Linux One"
+
+#~ msgid "Linux Online"
+#~ msgstr "Linux On Line"
+
+#~ msgid "Linux Resources"
+#~ msgstr "Linux baliabideak"
+
+#~ msgid "Linux Weekly News"
+#~ msgstr "Linux-en asteroko berriak"
+
+#~ msgid "LinuxNewbie.org"
+#~ msgstr "LinuxNewbie.org"
+
+#~ msgid "LinuxOrbit.com"
+#~ msgstr "LinuxOrbit.com"
+
+#~ msgid "MandrakeSoft"
+#~ msgstr "MandrakeSoft"
+
+#~ msgid "Netraverse"
+#~ msgstr "Netraverse"
+
+#~ msgid "News and Media"
+#~ msgstr "Berriak eta hedabideak"
+
+#~ msgid "O'Reilly"
+#~ msgstr "O'Reilly"
+
+#~ msgid "OSDN"
+#~ msgstr "OSDN"
+
+#~ msgid "Open Source Asia"
+#~ msgstr "Open Source Asia"
+
+#~ msgid "OpenOffice"
+#~ msgstr "OpenOffice"
+
+#~ msgid "Penguin Computing"
+#~ msgstr "Penguin Computing"
+
+#~ msgid "Rackspace"
+#~ msgstr "Rackspace"
+
+#~ msgid "Red Hat"
+#~ msgstr "Red Hat"
+
+#~ msgid "Red Hat Network"
+#~ msgstr "Red Hat Network"
+
+#~ msgid "RedFlag Linux"
+#~ msgstr "RedFlag Linux"
+
+#~ msgid "SourceForge"
+#~ msgstr "SourceForge"
+
+#~ msgid "SuSE"
+#~ msgstr "SuSE"
+
+#~ msgid "Sun StarOffice"
+#~ msgstr "Sun StarOffice"
+
+#~ msgid "Sun Wah Linux"
+#~ msgstr "Sun Wah Linux"
+
+#~ msgid "Web Services"
+#~ msgstr "Web zerbitzuak"
+
+#~ msgid "Ximian"
+#~ msgstr "Ximian"
+
+#~ msgid "ZDNet Linux Hardware Database"
+#~ msgstr "ZDNet Linux Hardwarearen datu-basea"
+
+#~ msgid "ZDNet Linux Resource Center"
+#~ msgstr "ZDNet Linux-en baliabide-zentroa"
+
+#~ msgid "Zero-Knowledge"
+#~ msgstr "Zero-Knowledge"
+
+#~ msgid "Files thrown out:"
+#~ msgstr "Botatako fitxategiak:"
+
+#~ msgid "Files moved:"
+#~ msgstr "Lekuz aldatutako fitxategiak:"
+
+#~ msgid "Files linked:"
+#~ msgstr "Estekatutako fitxategiak:"
+
+#~ msgid "Files copied:"
+#~ msgstr "Kopiatutako fitxategiak:"
+
+#~ msgid "Icons Viewer"
+#~ msgstr "Ikono-ikustailea"
+
+#~ msgid "List Viewer"
+#~ msgstr "Zerrenda-ikustailea"
+
+#~ msgid "Nautilus Tree View"
+#~ msgstr "Nautilus-eko zuhaitzaren ikuspegia"
+
+#
+#~ msgid "Nautilus Tree side pane"
+#~ msgstr "Nautilus-eko zuhaitzaren albo-panela"
+
+#~ msgid "Nautilus file manager component that shows a scrollable list"
+#~ msgstr ""
+#~ "Zerrenda korrigarria erakusten duen Nautilus fitxategi-kudeatzailearen "
+#~ "osagaia"
+
+#~ msgid ""
+#~ "Nautilus file manager component that shows a scrollable list for search "
+#~ "results"
+#~ msgstr ""
+#~ "Bilaketaren emaitzen zerrenda korrigarria erakusten duen Nautilus "
+#~ "fitxategi-kudeatzailearen osagaia"
+
+#~ msgid ""
+#~ "Nautilus file manager component that shows a two-dimensional icon space"
+#~ msgstr ""
+#~ "Dimentsio biko ikono-eremua erakusten duen Nautilus fitxategi-"
+#~ "kudeatzailearen osagaia"
+
+#~ msgid "Nautilus file manager component that shows icons on the desktop"
+#~ msgstr ""
+#~ "Mahaigainean ikonoak erakusten dituen Nautilus fitxategi-kudeatzailearen "
+#~ "osagaia"
+
+#~ msgid "Nautilus file manager desktop icon view"
+#~ msgstr "Nautilus fitxategi-kudeatzailearen mahaigaineko ikonoen ikuspegia"
+
+#~ msgid "Nautilus file manager icon view"
+#~ msgstr "Nautilus fitxategi-kudeatzailearen ikono-ikuspegia"
+
+#~ msgid "Nautilus file manager list view"
+#~ msgstr "Nautilus fitxategi-kudeatzailearen zerrenda-ikuspegia"
+
+#~ msgid "Nautilus file manager search results list view"
+#~ msgstr ""
+#~ "Nautilus fitxategi-kudeatzailearen bilaketa-emaitzen zerrenda-ikuspegia"
+
+#~ msgid "Search List"
+#~ msgstr "Bilatze-zerrenda"
+
+#
+#~ msgid "View as Icons"
+#~ msgstr "Ikusi ikono gisa"
+
+#
+#~ msgid "View as List"
+#~ msgstr "Ikusi zerrenda gisa"
+
+#
+#~ msgid "View as _Icons"
+#~ msgstr "Ikusi _ikono gisa"
+
+#
+#~ msgid "View as _List"
+#~ msgstr "Ikusi _zerrenda gisa"
+
+#
+#~ msgid "_Empty"
+#~ msgstr "_Hustu"
+
+#
+#~ msgid "Use the default background for this location"
+#~ msgstr "Erabili atzeko plano lehenetsia helbide honetan"
+
+#
+#~ msgid "_Clear History"
+#~ msgstr "Gar_bitu historia"
+
+#
+#~ msgid "File Browser: %s"
+#~ msgstr "Fitxategi arakatzailea: %s"
+
+#~ msgid "Copyright (C) 1999-2001 Eazel, Inc."
+#~ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
+
+#~ msgid "CD _Creator"
+#~ msgstr "_CD sortzailea"
+
+#~ msgid "Open with..."
+#~ msgstr "Ireki honekin..."
+
+#~ msgid "bonobo_ui_init() failed."
+#~ msgstr "bonobo_ui_init()-ek huts egin du."
+
+#~ msgid "Factory for Nautilus component adapter factories"
+#~ msgstr "Nautilus-eko osagai egokitzaileen fabriken fabrika"
+
+#~ msgid "Factory for Nautilus component adapter factories "
+#~ msgstr "Nautilus-eko osagai egokitzaileen fabriken fabrika "
+
+#~ msgid ""
+#~ "Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+#~ "look like Nautilus Views"
+#~ msgstr ""
+#~ "Bonobo-ren kontrol arruntak edo kapsulagarriak Nautilus-en ikuspegien "
+#~ "itxura hartzeko egokitzen dituzten objektuen fabrika"
+
+#~ msgid "Nautilus component adapter factory"
+#~ msgstr "Nautilus-eko osagai egokitzaileen fabrika"
+
+#
+#~ msgid "Nautilus Emblem side pane"
+#~ msgstr "Nautilus-eko ikurren albo-panela"
+
+#
+#~ msgid "Nautilus Emblem view"
+#~ msgstr "Nautilus-en ikurren ikuspegia"
+
+#
+#~ msgid "History side pane"
+#~ msgstr "Historiaren albo-panela"
+
+#
+#~ msgid "History side pane for Nautilus"
+#~ msgstr "Nautilus-en historiaren albo-panela"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI unean bistaratuta"
+
+#
+#~ msgid "Image Properties content view component"
+#~ msgstr "Irudi-propietateen edukia ikusteko osagaia"
+
+#
+#~ msgid "Nautilus Image Properties view"
+#~ msgstr "Nautilus-eko irudi-propietateen ikuspegia"
+
+#
+#~ msgid "Notes side pane"
+#~ msgstr "Oharren albo-panela"
+
+#
+#~ msgid "Notes side pane for Nautilus"
+#~ msgstr "Nautilus-en oharren albo-panela"
+
+#~ msgid "Factory for text view"
+#~ msgstr "Testu-ikuspegiaren fabrika"
+
+#~ msgid "Text"
+#~ msgstr "Testua"
+
+#~ msgid "Text Viewer"
+#~ msgstr "Testu-ikustailea"
+
+#~ msgid "Text view"
+#~ msgstr "Testu-ikuspegia"
+
+#~ msgid "Text view factory"
+#~ msgstr "Testu-ikuspegiaren fabrika"
+
+#~ msgid "View as Text"
+#~ msgstr "Ikusi testu gisa"
+
+#~ msgid "animation to indicate on-going activity"
+#~ msgstr "lanean ari dela adierazteko animazioa"
+
+#~ msgid "throbber factory"
+#~ msgstr "taupaden fabrika"
+
+#~ msgid "throbber object factory"
+#~ msgstr "taupada-objektuen fabrika"
+
+#~ msgid "C_lear Text"
+#~ msgstr "_Garbitu testua"
+
+#~ msgid "Cut Text"
+#~ msgstr "Ebaki testua"
+
+#~ msgid "Remove the selected text without putting it on the clipboard"
+#~ msgstr "Hautatutako testua kentzen du arbelean ipini gabe"
+
+#
+#~ msgid "Hide default bookmarks in the bookmark menu"
+#~ msgstr "Ezkutatu laster-marka lehenetsiak laster-marken menuan"
+
+#~ msgid ""
+#~ "If set to true, then Nautilus will just show the user's bookmarks in the "
+#~ "bookmark menu."
+#~ msgstr ""
+#~ "Egia ezartzen bada, Nautilus-ek erabiltzailearen laster-markak laster-"
+#~ "marken menuan erakutsiko ditu."
+
+#~ msgid "%s Viewer"
+#~ msgstr "%s ikustailea"
+
+#~ msgid "Could not complete specified action:  %s"
+#~ msgstr "Ezin izan da zehaztutako ekintza bukatu: %s"
+
+#~ msgid "Could not complete specified action."
+#~ msgstr "Ezin izan da zehaztutako ekintza bukatu."
+
+#
+#~ msgid "Use the default desktop background"
+#~ msgstr "Erabili mahaigainaren atzeko plano lehenetsia"
+
+#
+#~ msgid "Edit Launcher"
+#~ msgstr "Editatu abiarazlea"
+
+#~ msgid "Edit the launcher information"
+#~ msgstr "Editatu abiarazlearen informazioa"
+
+#
+#~ msgid "Format the selected volume"
+#~ msgstr "Eman formatua hautatutako bolumenari"
+
+#
+#~ msgid "Medi_a Properties"
+#~ msgstr "Euskarri_aren propietateak"
+
+#~ msgid "Prot_ect"
+#~ msgstr "Bab_estu"
+
+#
+#~ msgid "Show media properties for the selected volume"
+#~ msgstr ""
+#~ "Euskarriaren propietateak erakusten ditu hautatutako bolumenarentzat"
+
+#
+#~ msgid "_Format"
+#~ msgstr "_Formatua"
+
+#~ msgid "One of the side panels encountered an error and can't continue."
+#~ msgstr ""
+#~ "Alboko barraren paneletako batek errorea aurkitu du eta ezin izan du "
+#~ "jarraitu."
+
+#~ msgid "Unfortunately I couldn't tell which one."
+#~ msgstr "Tamalez, ez dakit zein errore den."
+
+#~ msgid "The %s side panel encountered an error and can't continue."
+#~ msgstr "%s alboko panelak errorea aurkitu du eta ezin izan du jarraitu."
+
+#~ msgid "If this keeps happening, you might want to turn this panel off."
+#~ msgstr ""
+#~ "Gehiagotan gertatzen bada, hobe izango duzu panel hori desaktibatzea."
+
+#~ msgid "Side Panel Failed"
+#~ msgstr "Alboko panelak huts egin du"
+
+#
+#~ msgid "Side Pane"
+#~ msgstr "Albo-panela"
+
+#~ msgid "Contains a side pane view"
+#~ msgstr "Albo-panelaren ikuspegia du"
+
+#~ msgid "Back"
+#~ msgstr "Atzera"
+
+#~ msgid "Find"
+#~ msgstr "Bilatu"
+
+#~ msgid "Forward"
+#~ msgstr "Aurrera"
+
+#~ msgid "Home"
+#~ msgstr "Etxera"
+
+#
+#~ msgid "Reload"
+#~ msgstr "Birkargatu"
+
+#~ msgid "Search this computer for files"
+#~ msgstr "Bilatu fitxategiak ordenagailu honetan"
+
+#~ msgid "Stop"
+#~ msgstr "Gelditu"
+
+#~ msgid "Up"
+#~ msgstr "Gora"
+
+#~ msgid "Print"
+#~ msgstr "Inprimatu"
+
+#~ msgid "Save"
+#~ msgstr "Gorde"
+
+#~ msgid "Profile Dump"
+#~ msgstr "Irauli profila"
+
+#~ msgid "Display the latest contents of the current location"
+#~ msgstr "Uneko helbidearen azken edukia bistaratzen du"
+
+#
+#~ msgid "Go to Empty CD folder"
+#~ msgstr "'Hustu CDa' karpetara joaten da"
+
+#~ msgid "Go up one level"
+#~ msgstr "Goragoko mailara joaten da"
+
+#~ msgid "Report Profiling"
+#~ msgstr "Profilen txostena"
+
+#~ msgid "Reset Profiling"
+#~ msgstr "Berrezarri profilak"
+
+#~ msgid "Start Profiling"
+#~ msgstr "Abiarazi profilak"
+
+#~ msgid "Stop Profiling"
+#~ msgstr "Geldiarazi profilak"
+
+#~ msgid "Stop loading this location"
+#~ msgstr "Utzi helbide hau kargatzeari"
+
+#, fuzzy
+#~ msgid "_CD/DVD Creator"
+#~ msgstr "_CD sortzailea"
+
+#~ msgid "_Profiler"
+#~ msgstr "_Profilgilea"
+
+#~ msgid "_Report Profiling"
+#~ msgstr "_Profilen txostena"
+
+#~ msgid "_Reset Profiling"
+#~ msgstr "Berre_zarri profilak"
+
+#~ msgid "_Start Profiling"
+#~ msgstr "_Abiarazi profilak"
+
+#~ msgid "_Stop Profiling"
+#~ msgstr "Geld_iarazi profilak"
+
+#~ msgid "Go to Computer"
+#~ msgstr "Joan ordenagailua"
+
+#
+#~ msgid "a title"
+#~ msgstr "izenburu bat"
+
+#~ msgid "the browse history"
+#~ msgstr "arakatze-historia"
+
+#
+#~ msgid "the current selection"
+#~ msgstr "uneko hautapena"
+
+#~ msgid "the type of window the view is embedded in"
+#~ msgstr "leiho mota, ikuspegia kapsulatua dagoena"
+
+#
+#, fuzzy
+#~ msgid "whether to show hidden files in the view"
+#~ msgstr "Fitxategi ezkutuak erakutsiko diren ala ez adierazten du"
+
+#
+#~ msgid "Application ID"
+#~ msgstr "ID aplikazioa"
+
+#~ msgid "The application ID of the window."
+#~ msgstr "Leihoaren ID aplikazioa."
+
+#~ msgid "Nautilus cannot determine what type of file it is."
+#~ msgstr "Nautilus-ek ezin du zein motatako fitxategia den zehaztu."
+
+#~ msgid ""
+#~ "Searching is unavailable right now, because you either have no index, or "
+#~ "the search service isn't running."
+#~ msgstr ""
+#~ "Bilaketa ez dago erabilgarri: ez duzu indizerik edo bilaketa-zerbitzua ez "
+#~ "dago martxan."
+
+#~ msgid ""
+#~ "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 ""
+#~ "Egiaztatu Medusa bilaketa-zerbitzua abiarazita duzula, eta indizerik ez "
+#~ "baduzu, Medusa indexatzailea exekutatzen ari dela."
+
+#~ msgid "Searching Unavailable"
+#~ msgstr "Bilaketa ez dago erabilgarri"
+
+#~ msgid "Go back a few pages"
+#~ msgstr "Joan orri batzuk atzerago"
+
+#~ msgid "Go forward a number of pages"
+#~ msgstr "Joan orri batzuk aurrerago"
+
+#
+#~ msgid "Try to fit in window"
+#~ msgstr "Saiatu leihora doitzen"
+
+#~ msgid "There was an error displaying help: %s"
+#~ msgstr "Errorea gertatu da laguntza bistaratzean: %s"
+
+#~ msgid "not in menu"
+#~ msgstr "ez dago menuan"
+
+#~ msgid "in menu for this file"
+#~ msgstr "menuan dago fitxategi honentzat"
+
+#~ msgid "in menu for \"%s\""
+#~ msgstr "menuan dago \"%s\"(r)entzat"
+
+#~ msgid "default for this file"
+#~ msgstr "lehenetsia fitxategi honentzat"
+
+#~ msgid "default for \"%s\""
+#~ msgstr "lehenetsia \"%s\"(r)entzat"
+
+#~ msgid "Is not in the menu for \"%s\" items."
+#~ msgstr "Ez dago menuan \"%s\" elementuentzat."
+
+#~ msgid "Is in the menu for \"%s\"."
+#~ msgstr "Badago menuan \"%s\"(r)entzat."
+
+#~ msgid "Is in the menu for \"%s\" items."
+#~ msgstr "Badago menuan \"%s\" elementuentzat."
+
+#~ msgid "Is in the menu for all \"%s\" items."
+#~ msgstr "Badago menuan \"%s\" elementu guztientzat."
+
+#~ msgid "Is the default for \"%s\"."
+#~ msgstr "\"%s\"(r)entzat lehenetsitakoa da."
+
+#~ msgid "Is the default for \"%s\" items."
+#~ msgstr "\"%s\" elementuentzat lehenetsitakoa da."
+
+#~ msgid "Is the default for all \"%s\" items."
+#~ msgstr "\"%s\" elementu guztientzat lehenetsitakoa da."
+
+#~ msgid "Modify \"%s\""
+#~ msgstr "Aldatu \"%s\""
+
+#~ msgid "Include in the menu for \"%s\" items"
+#~ msgstr "Sartu menuan \"%s\" elementuentzat."
+
+#~ msgid "Use as default for \"%s\" items"
+#~ msgstr "Erabili lehenetsi gisa \"%s\" elementuentzat."
+
+#~ msgid "Include in the menu for \"%s\" only"
+#~ msgstr "Sartu menuan \"%s\"(r)entzat bakarrik."
+
+#~ msgid "Use as default for \"%s\" only"
+#~ msgstr "Erabili lehenetsi gisa \"%s\"(r)entzat bakarrik."
+
+#~ msgid "Don't include in the menu for \"%s\" items"
+#~ msgstr "Ez sartu menuan \"%s\" elementuentzat"
+
+#~ msgid "Status"
+#~ msgstr "Egoera"
+
+#~ msgid "Done"
+#~ msgstr "Eginda"
+
+#
+#~ msgid "_Modify..."
+#~ msgstr "_Aldatu..."
+
+#~ msgid "File Types and Programs"
+#~ msgstr "Fitxategi-motak eta programak"
+
+#
+#~ msgid "_Go There"
+#~ msgstr "_Joan horra"
+
+#
+#~ msgid ""
+#~ "You can configure which programs are offered for which file types in the "
+#~ "File Types and Programs dialog."
+#~ msgstr ""
+#~ "Fitxategi-mota bakoitzarentzat zein programa eskainiko diren konfigura "
+#~ "dezakezu Fitxategi-motak eta programak elkarrizketa-koadroan."
+
+#
+#~ msgid "Open with Other Application"
+#~ msgstr "Ireki beste aplikazio batekin"
+
+#~ msgid "Choose an application with which to open \"%s\":"
+#~ msgstr "Aukeratu \"%s\" irekitzeko aplikazio bat:"
+
+#
+#~ msgid "Open with Other Viewer"
+#~ msgstr "Ireki beste ikustaile batekin"
+
+#~ msgid "Choose a view for \"%s\":"
+#~ msgstr "Aukeratu ikuspegi bat \"%s\"(r)entzat:"
+
+#~ msgid "No viewers are available for \"%s\"."
+#~ msgstr "Ez dago ikustaile erabilgarririk \"%s\"(r)entzat."
+
+#~ msgid "No Viewers Available"
+#~ msgstr "Ikustaile erabilgarririk ez"
+
+#~ msgid "There is no application associated with \"%s\"."
+#~ msgstr "Ez dago \"%s\"(r)i lotutako aplikaziorik."
+
+#
+#~ msgid "No Application Associated"
+#~ msgstr "Ez dago lotutako aplikaziorik"
+
+#~ msgid "There is no action associated with \"%s\"."
+#~ msgstr "Ez dago \"%s\"(r)i lotutako ekintzarik."
+
+#
+#~ msgid "No Action Associated"
+#~ msgstr "Ez dago lotutako ekintzarik"
+
+#~ msgid ""
+#~ "You can configure GNOME to associate applications with file types. Do you "
+#~ "want to associate an application with this file type now?"
+#~ msgstr ""
+#~ "GNOME konfigura dezakezu fitxategi-motekin aplikazioak lotzeko. Aplikazio "
+#~ "bat fitxategi-mota honekin lotu nahi duzu orain?"
+
+#
+#~ msgid "_Associate Application"
+#~ msgstr "_Lotu aplikazioa"
+
+#~ msgid "The viewer associated with \"%s\" is invalid."
+#~ msgstr "\"%s\"(r)ekin lotutako ikustailea baliogabea da."
+
+#~ msgid "Invalid Viewer Associated"
+#~ msgstr "Lotutako ikustaile baliogabea"
+
+#~ msgid "The application associated with \"%s\" is invalid."
+#~ msgstr "\"%s\"(r)ekin lotutako aplikazioa baliogabea da."
+
+#
+#~ msgid "Invalid Application Associated"
+#~ msgstr "Lotutako aplikazio baliogabea"
+
+#~ msgid "The action associated with \"%s\" is invalid."
+#~ msgstr "\"%s\"(r)ekin lotutako ekintza baliogabea da."
+
+#
+#~ msgid "Invalid Action Associated"
+#~ msgstr "Lotutako ekintza baliogabea"
+
+#~ msgid ""
+#~ "You can configure GNOME to associate a different application or viewer "
+#~ "with this file type. Do you want to associate an application or viewer "
+#~ "with this file type now?"
+#~ msgstr ""
+#~ "GNOME konfigura dezakezu fitxategi-mota honekin beste aplikazio edo "
+#~ "ikustaile bat lotzeko. Fitxategi-mota honekin aplikazio edo ikustaile bat "
+#~ "lotu nahi duzu orain?"
+
+#
+#~ msgid "_Associate Action"
+#~ msgstr "_Lotu ekintza"
+
+#~ msgid "Adjust your user environment"
+#~ msgstr "Egokitu zure erabiltzaile-ingurunea"
+
+#
+#~ msgid "Desktop Preferences"
+#~ msgstr "Mahaigaineko hobespenak"
+
+#~ msgid "Configure network services (web server, DNS server, etc.)"
+#~ msgstr ""
+#~ "Konfiguratu sare-zerbitzuak (web zerbitzaria, DNS zerbitzaria, etab.)"
+
+#
+#~ msgid "Server Settings"
+#~ msgstr "Zerbitzariaren ezarpenak"
+
+#
+#~ msgid "Configure network services"
+#~ msgstr "Konfiguratu sare-zerbitzuak"
+
+#~ msgid "Start Here"
+#~ msgstr "Hasi hemen"
+
+#~ msgid "Change systemwide settings (affects all users)"
+#~ msgstr ""
+#~ "Aldatu sistema osoaren ezarpenak (erabiltzaile guztiengan du eragina)"
+
+#~ msgid "System Settings"
+#~ msgstr "Sistemaren ezarpenak"
+
+#~ msgid "Add Nautilus to session"
+#~ msgstr "Gehitu Nautilus saioari"
+
+#~ msgid ""
+#~ "If this is set to true, Nautilus adds itself to the session when it "
+#~ "starts up. This means it will be started the next time you log in."
+#~ msgstr ""
+#~ "Hemen egia ezartzen bada, Nautilus bera saiora gehituko da abiaraztean. "
+#~ "Horrek esan nahi du saioa hasten duzun hurrengo aldian abiaraziko dela."
+
+#~ msgid "Browse Filesystem"
+#~ msgstr "Arakatu fitxategi-sistema"
+
+#~ msgid "Other _Application..."
+#~ msgstr "Beste _aplikazio bat..."
+
+#~ msgid "An _Application..."
+#~ msgstr "_Aplikazio bat..."
+
+#~ msgid "Example:"
+#~ msgstr "Adibidea:"
+
+#~ msgid "Icon Captions"
+#~ msgstr "Ikonoen epigrafeak"
+
+#~ msgid "nautilus: --check cannot be used with URIs.\n"
+#~ msgstr "nautilus: --check ezin da URIekin erabili.\n"
+
+#~ msgid "nautilus: --restart cannot be used with URIs.\n"
+#~ msgstr "nautilus: --restart ezin da URIekin erabili.\n"
+
+#~ msgid "View as..."
+#~ msgstr "Ikusi honela..."
+
+#~ msgid "Choose a view for the current location, or modify the set of views"
+#~ msgstr "Aukeratu uneko helbidearen ikuspegia, edo aldatu ikuspegi-multzoa"
+
+#~ msgid "_View as..."
+#~ msgstr "I_kusi honela..."
+
+#~ msgid "Error while moving. "
+#~ msgstr "Errorea lekuz aldatzean. "
+
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "Fitxategi batzuk ezin izan dira ikur gisa gehitu, irudi baliogabeak "
+#~ "ziruditelako."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Hardware ikuspegiaren fabrika"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Hardwarearen ikustailea"
+
+#~ msgid "Hardware view"
+#~ msgstr "Hardwarearen ikuspegia"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Ikusi Hardware gisa"
+
+#~ msgid "hardware view"
+#~ msgstr "hardwarearen ikuspegia"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "hardware ikuspegiaren ikonoaren izena"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "hardwareari buruzko informazioaren laburpena"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s PUZ\n"
+#~ "%s MHz\n"
+#~ "%s K: cachearen tamaina"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB RAM"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB RAM"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Jardun-denbora: %d egun, %d ordu, %d minutu"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Hardwarearen informazio orokorra"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "PUZ orrialdearen leku-marka da hau."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "RAM orrialdearen leku-marka da hau."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "IDE orrialdearen leku-marka da hau."
+
+#~ msgid "Search Google for Selected Text"
+#~ msgstr "Bilatu Google-n hautatutako testua"
+
+#~ msgid "Use Google to search the web for the selected text"
+#~ msgstr "Google erabiltzen du hautatutako testua web-ean bilatzeko"
+
+#~ msgid "Look Up Selected Text in Dictionary"
+#~ msgstr "Bilatu hiztegian hautatutako testua"
+
+#~ msgid "Look up the selected text in the Merriam-Webster dictionary"
+#~ msgstr "Hautatutako testua Merriam-Webster hiztegian bilatzen du"
+
+#~ msgid "Can't find an hbox, using a normal file selection"
+#~ msgstr "Ezin da hbox-a aurkitu, fitxategi-hautapen normala erabiliko da"
+
+#~ msgid "AFFS Volume"
+#~ msgstr "AFFS bolumena"
+
+#~ msgid "AFS Network Volume"
+#~ msgstr "AFS sareko bolumena"
+
+#~ msgid "Auto-detected Volume"
+#~ msgstr "Auto-detektatutako bolumena"
+
+#~ msgid "CD Digital Audio"
+#~ msgstr "CD audio digitala"
+
+#~ msgid "CD-ROM Drive"
+#~ msgstr "CD-ROM unitatea"
+
+#~ msgid "CDROM Volume"
+#~ msgstr "CD-ROMaren bolumena"
+
+#~ msgid "DVD Volume"
+#~ msgstr "DVDren bolumena"
+
+#~ msgid "Enhanced DOS Volume"
+#~ msgstr "DOS bolumen hobetua"
+
+#~ msgid "Ext2 Linux Volume"
+#~ msgstr "Ext2 Linux bolumena"
+
+#~ msgid "Ext3 Linux Volume"
+#~ msgstr "Ext3 Linux bolumena"
+
+#~ msgid "Hardware Device Volume"
+#~ msgstr "Hardwareko gailuaren bolumena"
+
+#
+#~ msgid "Hsfs CDROM Volume"
+#~ msgstr "Hsfs CD-ROM bolumena"
+
+#~ msgid "JFS Volume"
+#~ msgstr "JFS bolumena"
+
+#~ msgid "MSDOS Volume"
+#~ msgstr "MSDOS bolumena"
+
+#
+#~ msgid "MacOS Volume"
+#~ msgstr "MacOS bolumena"
+
+#~ msgid "Minix Volume"
+#~ msgstr "Minix bolumena"
+
+#~ msgid "NFS Network Volume"
+#~ msgstr "NFS sareko bolumena"
+
+#
+#~ msgid "Pcfs Solaris Volume"
+#~ msgstr "Pcfs Solaris bolumena"
+
+#~ msgid "ReiserFS Linux Volume"
+#~ msgstr "ReiserFS Linux bolumena"
+
+#~ msgid "Solaris/BSD Volume"
+#~ msgstr "Solaris/BSD bolumena"
+
+#
+#~ msgid "SuperMount Volume"
+#~ msgstr "SuperMount bolumena"
+
+#~ msgid "System Volume"
+#~ msgstr "Sistema-bolumena"
+
+#
+#~ msgid "Udfs Solaris Volume"
+#~ msgstr "Udfs Solaris bolumena"
+
+#~ msgid "Windows NT Volume"
+#~ msgstr "Windows NT bolumena"
+
+#~ msgid "Windows VFAT Volume"
+#~ msgstr "Windows VFAT bolumena"
+
+#~ msgid "XFS Linux Volume"
+#~ msgstr "XFS Linux bolumena"
+
+#~ msgid "XIAFS Volume"
+#~ msgstr "XIAFS bolumena"
+
+#~ msgid "Xenix Volume"
+#~ msgstr "Xenix bolumena"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Errorea \"%s\"(e)ra kopiatzean.\n"
+#~ "\n"
+#~ "Ez dago nahikoa leku helburuan."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Errorea \"%s\"(e)n esteka sortzean.\n"
+#~ "\n"
+#~ "Ez dago nahikoa leku helburuan."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Errorea elementuak \"%s\"(e)ra eramatean.\n"
+#~ "\n"
+#~ "Ez duzu karpeta horretan idazteko baimenik."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Errorea elementuak \"%s\"(e)ra eramatean.\n"
+#~ "\n"
+#~ "Helburuko diskoa irakurtzeko soilik da."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Errorea \"%s\"(e)n estekak sortzean.\n"
+#~ "\n"
+#~ "Ez duzu karpeta horretan idazteko baimenik."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Errorea \"%s\"(e)n estekak sortzean.\n"
+#~ "\n"
+#~ "Helburuko diskoa irakurtzeko soilik da."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" errorea \"%s\" kopiatzean.\n"
+#~ "\n"
+#~ "Jarraitu nahi duzu?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" errorea \"%s\" lekuz aldatzean.\n"
+#~ "\n"
+#~ "Jarraitu nahi duzu?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" errorea \"%s\" ezabatzean.\n"
+#~ "\n"
+#~ "Jarraitu nahi duzu?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" errorea kopiatzean.\n"
+#~ "\n"
+#~ "Jarraitu nahi duzu?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" errorea esteka sortzean.\n"
+#~ "\n"
+#~ "Jarraitu nahi duzu?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" ezabatzean.\n"
+#~ "\n"
+#~ "Jarraitu nahi duzu?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Ezin da zakarrontzian kopiatu"
+
+#~ msgid "foo"
+#~ msgstr "foo"
+
+#~ msgid "foo (copy)"
+#~ msgstr "foo (kopia)"
+
+#~ msgid ".bashrc"
+#~ msgstr ".bashrc"
+
+#~ msgid ".bashrc (copy)"
+#~ msgstr ".bashrc (kopia)"
+
+#~ msgid ".foo.txt"
+#~ msgstr ".foo.txt"
+
+#~ msgid ".foo (copy).txt"
+#~ msgstr ".foo (kopia).txt"
+
+#~ msgid "foo foo"
+#~ msgstr "foo foo"
+
+#~ msgid "foo foo (copy)"
+#~ msgstr "foo foo (kopia)"
+
+#~ msgid "foo.txt"
+#~ msgstr "foo.txt"
+
+#~ msgid "foo (copy).txt"
+#~ msgstr "foo (kopia).txt"
+
+#~ msgid "foo foo.txt"
+#~ msgstr "foo foo.txt"
+
+#~ msgid "foo foo (copy).txt"
+#~ msgstr "foo foo (kopia).txt"
+
+#~ msgid "foo foo.txt txt"
+#~ msgstr "foo foo.txt txt"
+
+#~ msgid "foo foo (copy).txt txt"
+#~ msgstr "foo foo (kopia).txt txt"
+
+#~ msgid "foo...txt"
+#~ msgstr "foo...txt"
+
+#~ msgid "foo.. (copy).txt"
+#~ msgstr "foo.. (kopia).txt"
+
+#~ msgid "foo..."
+#~ msgstr "foo..."
+
+#~ msgid "foo... (copy)"
+#~ msgstr "foo... (kopia)"
+
+#~ msgid "foo. (copy)"
+#~ msgstr "foo.(kopia)"
+
+#~ msgid "foo. (another copy)"
+#~ msgstr "foo.(beste kopia bat)"
+
+#~ msgid "foo (another copy)"
+#~ msgstr "foo (beste kopia bat)"
+
+#~ msgid "foo (another copy).txt"
+#~ msgstr "foo (beste kopia bat).txt"
+
+#~ msgid "foo (3rd copy)"
+#~ msgstr "foo (3. kopia)"
+
+#~ msgid "foo (3rd copy).txt"
+#~ msgstr "foo (3. kopia).txt"
+
+#~ msgid "foo foo (another copy).txt"
+#~ msgstr "foo foo (beste kopia bat).txt"
+
+#~ msgid "foo foo (3rd copy).txt"
+#~ msgstr "foo foo (3. kopia).txt"
+
+#~ msgid "foo (13th copy)"
+#~ msgstr "foo (13. kopia)"
+
+#~ msgid "foo (14th copy)"
+#~ msgstr "foo (14. kopia)"
+
+#~ msgid "foo (13th copy).txt"
+#~ msgstr "foo (13. kopia).txt"
+
+#~ msgid "foo (14th copy).txt"
+#~ msgstr "foo (14. kopia).txt"
+
+#~ msgid "foo (21st copy)"
+#~ msgstr "foo (21. kopia)"
+
+#~ msgid "foo (22nd copy)"
+#~ msgstr "foo (22. kopia)"
+
+#~ msgid "foo (21st copy).txt"
+#~ msgstr "foo (21. kopia).txt"
+
+#~ msgid "foo (22nd copy).txt"
+#~ msgstr "foo (22. kopia).txt"
+
+#~ msgid "foo (23rd copy)"
+#~ msgstr "foo (23. kopia)"
+
+#~ msgid "foo (23rd copy).txt"
+#~ msgstr "foo (23. kopia).txt"
+
+#~ msgid "foo (24th copy)"
+#~ msgstr "foo (24. kopia)"
+
+#~ msgid "foo (24th copy).txt"
+#~ msgstr "foo (24. kopia).txt"
+
+#~ msgid "foo (25th copy)"
+#~ msgstr "foo (25. kopia)"
+
+#~ msgid "foo (25th copy).txt"
+#~ msgstr "foo (25. kopia).txt"
+
+#~ msgid "foo foo (24th copy)"
+#~ msgstr "foo foo (24. kopia)"
+
+#~ msgid "foo foo (25th copy)"
+#~ msgstr "foo foo (25. kopia)"
+
+#~ msgid "foo foo (24th copy).txt"
+#~ msgstr "foo foo (24. kopia).txt"
+
+#~ msgid "foo foo (25th copy).txt"
+#~ msgstr "foo foo (25. kopia).txt"
+
+#~ msgid "foo foo (100000000000000th copy).txt"
+#~ msgstr "foo foo (100000000000000. kopia).txt"
+
+#~ msgid "foo (10th copy)"
+#~ msgstr "foo (10. kopia)"
+
+#~ msgid "foo (11th copy)"
+#~ msgstr "foo (11. kopia)"
+
+#~ msgid "foo (10th copy).txt"
+#~ msgstr "foo (10. kopia).txt"
+
+#~ msgid "foo (11th copy).txt"
+#~ msgstr "foo (11. kopia).txt"
+
+#~ msgid "foo (12th copy)"
+#~ msgstr "foo (12. kopia)"
+
+#~ msgid "foo (12th copy).txt"
+#~ msgstr "foo (12. kopia).txt"
+
+#~ msgid "foo (110th copy)"
+#~ msgstr "foo (110. kopia)"
+
+#~ msgid "foo (111th copy)"
+#~ msgstr "foo (111. kopia)"
+
+#~ msgid "foo (110th copy).txt"
+#~ msgstr "foo (110. kopia).txt"
+
+#~ msgid "foo (111th copy).txt"
+#~ msgstr "foo (111. kopia).txt"
+
+#~ msgid "foo (122nd copy)"
+#~ msgstr "foo (122. kopia)"
+
+#~ msgid "foo (123rd copy)"
+#~ msgstr "foo (123. kopia)"
+
+#~ msgid "foo (122nd copy).txt"
+#~ msgstr "foo (122. kopia).txt"
+
+#~ msgid "foo (123rd copy).txt"
+#~ msgstr "foo (123. kopia).txt"
+
+#~ msgid "foo (124th copy)"
+#~ msgstr "foo (124. kopia)"
+
+#~ msgid "foo (124th copy).txt"
+#~ msgstr "foo (124. kopia).txt"
+
+#~ msgid "0 items"
+#~ msgstr "0 elementu"
+
+#~ msgid "0 folders"
+#~ msgstr "0 karpeta"
+
+#~ msgid "0 files"
+#~ msgstr "0 fitxategi"
+
+#~ msgid "1 item"
+#~ msgstr "1 elementu"
+
+#~ msgid "1 folder"
+#~ msgstr "1 karpeta"
+
+#~ msgid "date changed"
+#~ msgstr "aldatze-data"
+
+#~ msgid "file icon"
+#~ msgstr "fitxategiaren ikonoa"
+
+#~ msgid ""
+#~ "If you would like to enable fast searches, you can edit the file %s as "
+#~ "root. Setting the enabled flag to \"yes\" will turn medusa services on.\n"
+#~ "To start indexing and search services right away, you should also run the "
+#~ "following commands as root:\n"
+#~ "\n"
+#~ "medusa-indexd\n"
+#~ "medusa-searchd\n"
+#~ "\n"
+#~ "Fast searches will not be available until an initial index of your files "
+#~ "has been created.  This may take a long time."
+#~ msgstr ""
+#~ "Bilaketa lasterrak gaitu nahi badituzu, editatu %s fitxategia root gisa. "
+#~ "Gaitzeko bandera \"bai\" moduan jarriz, Medusa zerbitzuak aktibatuko "
+#~ "dituzu.\n"
+#~ "Indexazio- eta bilaketa-zerbitzuak oraintxe bertan abiarazteko, exekutatu "
+#~ "ondoko komandoak root gisa :\n"
+#~ "\n"
+#~ "medusa-indexd\n"
+#~ "\n"
+#~ "medusa-searchd\n"
+#~ "\n"
+#~ "Bilaketa lasterrak ez dira erabilgarri egongo fitxategien hasierako "
+#~ "indizea sortzen duzun arte. Denbora beharko du."
+
+#~ msgid ""
+#~ "Medusa, the application that performs searches, cannot be found on your "
+#~ "system.  If you have compiled nautilus yourself, you will need to install "
+#~ "a copy of medusa and recompile nautilus.  (A copy of Medusa may be "
+#~ "available at ftp://ftp.gnome.org)\n"
+#~ "If you are using a packaged version of Nautilus, fast searching is not "
+#~ "available.\n"
+#~ msgstr ""
+#~ "Zure sisteman ezin da Medusa, bilaketak burutzen dituen aplikazioa, "
+#~ "aurkitu. Nautilus zuk zeuk konpilatu baldin baduzu, Medusa-ren kopia bat "
+#~ "instalatu eta Nautilus berriro konpilatu beharko duzu (Medusaren kopia "
+#~ "hemen lor dezakezu: ftp://ftp.gnome.org)\n"
+#~ "Nautilus-en paketeko bertsioa erabiltzen ari bazara, bilaketa lasterra ez "
+#~ "da erabilgarri egongo.\n"
+
+#
+#~ msgid "C_hoose"
+#~ msgstr "Au_keratu"
+
+#~ msgid ""
+#~ "The default action can't open \"%s\" because it can't access files at \"%s"
+#~ "\" locations.  No other actions are available to view this file.  If you "
+#~ "copy this file onto your computer, you may be able to open it."
+#~ msgstr ""
+#~ "Ekintza lehenetsiak ezin du \"%s\" ireki, ezin dituelako \"%s\" "
+#~ "helbideetako fitxategiak atzitu. Ez dago beste ekintzarik erabilgarri "
+#~ "fitxategi hau ikusteko. Fitxategia zure ordenagailuan kopiatzen baduzu, "
+#~ "ireki ahal izango duzu."
+
+#~ msgid "[Items ]containing \"%s\" in their names"
+#~ msgstr "Izenean \"%s\" dutenak [elementuak ]"
+
+#~ msgid "[Items ]starting with \"%s\""
+#~ msgstr "Hasieran \"%s\" dutenak [elementuak ]"
+
+#~ msgid "[Items ]ending with %s"
+#~ msgstr "Amaieran %s dutenak [elementuak ]"
+
+#~ msgid "[Items ]not containing \"%s\" in their names"
+#~ msgstr "Izenean \"%s\" ez dutenak [elementuak ]"
+
+#~ msgid "[Items ]matching the regular expression \"%s\""
+#~ msgstr "\"%s\" adierazpen erregularrarekin bat datozenak [elementuak ]"
+
+#~ msgid "[Items ]matching the file pattern \"%s\""
+#~ msgstr "\"%s\" fitxategi-ereduarekin bat datozenak [elementuak]"
+
+#~ msgid "[Items that are ]regular files"
+#~ msgstr "Fitxategi erregularrak [diren elementuak]"
+
+#~ msgid "[Items that are ]text files"
+#~ msgstr "Testu-fitxategiak [diren elementuak ]"
+
+#~ msgid "[Items that are ]applications"
+#~ msgstr "Aplikazioak [diren elementuak ]"
+
+#~ msgid "[Items that are ]music"
+#~ msgstr "Musika [diren elementuak ]"
+
+#~ msgid "[Items ]that are not %s"
+#~ msgstr "%s ez direnak [elementuak ]"
+
+#~ msgid "[Items ]that are %s"
+#~ msgstr "%s direnak [elementuak ]"
+
+#~ msgid "[Items ]not owned by \"%s\""
+#~ msgstr "jabea \"%s\" ez dutenak [elementuak ]"
+
+#~ msgid "[Items ]owned by \"%s\""
+#~ msgstr "jabea \"%s\" dutenak [elementuak ]"
+
+#~ msgid "[Items ]with owner UID \"%s\""
+#~ msgstr "jabearen UID \"%s\" dutenak [elementuak ]"
+
+#~ msgid "[Items ]with owner UID other than \"%s\""
+#~ msgstr "jabearen UID \"%s\" ez dutenak [elementuak ]"
+
+#~ msgid "[Items ]larger than %s bytes"
+#~ msgstr "%s byte baino gehiagokoak [elementuak ]"
+
+#~ msgid "[Items ]smaller than %s bytes"
+#~ msgstr "%s byte baino gutxiagokoak [elementuak ]"
+
+#~ msgid "[Items ]of %s bytes"
+#~ msgstr "%s bytekoak [elementuak ]"
+
+#~ msgid "[Items ]modified today"
+#~ msgstr "Gaur aldatutakoak [elementuak ]"
+
+#~ msgid "[Items ]modified yesterday"
+#~ msgstr "Atzo aldatutakoak [elementuak ]"
+
+#~ msgid "[Items ]modified on %s"
+#~ msgstr "Aldatze-data %s dutenak [elementuak ]"
+
+#~ msgid "[Items ]not modified on %s"
+#~ msgstr "Aldatze-data %s ez dutenak [elementuak ]"
+
+#~ msgid "[Items ]modified before %s"
+#~ msgstr "%s baino lehenago aldatutakoak [elementuak ]"
+
+#~ msgid "[Items ]modified after %s"
+#~ msgstr "%s baino geroago aldatutakoak [elementuak ]"
+
+#~ msgid "[Items ]modified within a week of %s"
+#~ msgstr "%s egunari dagokion astean aldatutakoak [elementuak ]"
+
+#~ msgid "[Items ]modified within a month of %s"
+#~ msgstr "%s egunari dagokion hilean aldatutakoak [elementuak ]"
+
+#~ msgid "[Items ]marked with \"%s\""
+#~ msgstr "\"%s\" marka dutenak [elementuak ]"
+
+#~ msgid "[Items ]not marked with \"%s\""
+#~ msgstr "\"%s\" marka ez dutenak [elementuak ]"
+
+#~ msgid "[Items ]with all the words \"%s\""
+#~ msgstr "\"%s\" hitz guztiak dituztenak [elementuak ]"
+
+#~ msgid "[Items ]containing one of the words \"%s\""
+#~ msgstr "\"%s\" hitzetako bat dutenak [elementuak ]"
+
+#~ msgid "[Items ]without all the words \"%s\""
+#~ msgstr "\"%s\" hitz guztiak ez dituztenak [elementuak ]"
+
+#~ msgid "[Items ]without any of the words \"%s\""
+#~ msgstr "\"%s\" hitzetako bat ere ez dutenak [elementuak ]"
+
+#~ msgid ""
+#~ "[Items larger than 400K] and [without all the words \"apple orange\"]"
+#~ msgstr ""
+#~ "[400K baino gehiagoko elementuak] eta [\"apple orange\" hitz guztiak ez "
+#~ "dituztenak]"
+
+#~ msgid ""
+#~ "[Items larger than 400K], [owned by root and without all the words "
+#~ "\"apple orange\"]"
+#~ msgstr ""
+#~ "[400K baino gehiagoko elementuak], [root-arenak eta \"apple orange\" hitz "
+#~ "biak ez dituztenak]"
+
+#~ msgid "Items %s"
+#~ msgstr "%s elementuak"
+
+#~ msgid "Items containing \"stuff\" in their names"
+#~ msgstr "Izenean \"stuff\" duten elementuak"
+
+#~ msgid "Items that are regular files"
+#~ msgstr "Fitxategi erregularrak diren elementuak"
+
+#~ msgid "Items containing \"stuff\" in their names and that are regular files"
+#~ msgstr "Izenean \"stuff\" duten eta fitxategi erregularrak diren elementuak"
+
+#~ msgid ""
+#~ "Items containing \"stuff\" in their names, that are regular files and "
+#~ "smaller than 2000 bytes"
+#~ msgstr ""
+#~ "Izenean \"stuff\" duten elementuak, fitxategi arruntak eta 2000 byte "
+#~ "baino gutxiagokoak direnak"
+
+#~ msgid "Items containing \"medusa\" in their names and that are folders"
+#~ msgstr "Izenean \"medusa\" dutenak eta karpeta direnak"
+
+#~ msgid "Searching Disks"
+#~ msgstr "Diskoetan bilatzen"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus zure diskoetan ari da zakarrontziko karpetak bilatzen."
+
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgid "Floppy"
+#~ msgstr "Disketea"
+
+#~ msgid "CD-ROM"
+#~ msgstr "CD-ROMa"
+
+#~ msgid "Zip Drive"
+#~ msgstr "Zip unitatea"
+
+#~ msgid "Audio CD"
+#~ msgstr "Audio CDa"
+
+#~ msgid "Root Volume"
+#~ msgstr "Erroko bolumena"
+
+#~ msgid ""
+#~ "Nautilus was unable to mount the floppy drive. There is probably no "
+#~ "floppy in the drive."
+#~ msgstr ""
+#~ "Nautilus-ek ezin izan du diskete-unitatea muntatu. Unitatean ez da "
+#~ "disketerik egongo seguru asko."
+
+#~ msgid ""
+#~ "Nautilus was unable to mount the volume. There is probably no media in "
+#~ "the device."
+#~ msgstr ""
+#~ "Nautilus-ek ezin izan du bolumena muntatu. Gailuan ez da euskarririk "
+#~ "izango seguru asko."
+
+#~ msgid ""
+#~ "Nautilus was unable to mount the floppy drive. The floppy is probably in "
+#~ "a format that cannot be mounted."
+#~ msgstr ""
+#~ "Nautilus-ek ezin izan du diskete-unitatea muntatu. Disketea muntatu ezin "
+#~ "den formatu batean egongo da seguru asko."
+
+#~ msgid ""
+#~ "Nautilus was unable to mount the selected volume. The volume is probably "
+#~ "in a format that cannot be mounted."
+#~ msgstr ""
+#~ "Nautilus-ek ezin izan du hautatutako bolumena muntatu. Bolumena muntatu "
+#~ "ezin den formatu batean egongo da, seguru asko."
+
+#~ msgid "Nautilus was unable to mount the selected floppy drive."
+#~ msgstr "Nautilus-ek ezin izan du hautatutako diskete-unitatea muntatu."
+
+#~ msgid "Nautilus was unable to mount the selected volume."
+#~ msgstr "Nautilus-ek ezin izan du hautatutako bolumena muntatu."
+
+#~ msgid "Nautilus was unable to unmount the selected volume."
+#~ msgstr "Nautilus-ek ezin izan du hautatutako bolumena desmuntatu."
+
+#~ msgid "ISO 9660 Volume"
+#~ msgstr "ISO 9660 bolumena"
+
+#~ msgid "Error executing utility program '%s': %s"
+#~ msgstr "Errorea utilitate-programa exekutatzean: %s: %s"
+
+#~ msgid "1 folder selected"
+#~ msgstr "1 karpeta hautatuta"
+
+#~ msgid " (containing 0 items)"
+#~ msgstr " (0 elementu ditu)"
+
+#~ msgid " (containing 1 item)"
+#~ msgstr " (elementu bat du)"
+
+#~ msgid " (containing a total of 0 items)"
+#~ msgstr " (guztira 0 elementu ditu)"
+
+#~ msgid " (containing a total of 1 item)"
+#~ msgstr " (guztira elementu bat du)"
+
+#~ msgid "1 other item selected (%s)"
+#~ msgstr "beste elementu bat hautatuta (%s)"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Hautatutako %d elementuak ezin dira zakarrontzira eraman. Berehala "
+#~ "ezabatu nahi dituzu?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "Hautatutako elementuetako %d ezin dira zakarrontzira eraman. %d elementu "
+#~ "horiek berehala ezabatu nahi dituzu?"
+
+#~ msgid "Other _Viewer..."
+#~ msgstr "Beste _ikustaile bat..."
+
+#~ msgid "A _Viewer..."
+#~ msgstr "_Ikustaile bat..."
+
+#~ msgid "Open _in This Window"
+#~ msgstr "Ireki _leiho honetan"
+
+#~ msgid "Open _in %d New Windows"
+#~ msgstr "Ireki %d _leiho berritan"
+
+#
+#~ msgid "File name"
+#~ msgstr "Fitxategi-izena"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Jaregin duzun fitxategia ez da irudia. Irudi lokalak bakarrik erabil "
+#~ "ditzakezu ikono pertsonal gisa."
+
+#~ msgid "%d items, totalling %s"
+#~ msgstr "%d elementu, guztira %s"
+
+#~ msgid ""
+#~ "Search results may not include items modified after %s, when your drive "
+#~ "was last indexed."
+#~ msgstr ""
+#~ "Baliteke bilaketaren emaitzak unitatea azken aldiz indexatu zenuenetik, (%"
+#~ "s)tik aurrera aldatutako elementuak ez jasotzea."
+
+#~ msgid "Search Results"
+#~ msgstr "Bilaketaren emaitza"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Medusa bilaketa-zerbitzua ez dago erabilgarri, instalatu gabe dagoelako."
+
+#~ msgid "Search Service Not Available"
+#~ msgstr "Bilaketa-zerbitzua ez dago erabilgarri"
+
+#~ msgid ""
+#~ "The search you have selected is newer than the index on your system.  The "
+#~ "search will return no results right now.  You can create a new  index by "
+#~ "running \"medusa-indexd\" as root on the command line."
+#~ msgstr ""
+#~ "Hautatu duzun bilaketa zure sistemak duen indizea baino berriagoa da. "
+#~ "Bilaketak ez du emaitzarik emango orain. Indize berria sor dezakezu "
+#~ "komando-lerroan \"medusa-indexd\" komandoa root gisa exekutatuz."
+
+#~ msgid "Search for items that are too new"
+#~ msgstr "Bilatu berriegiak diren elementuak"
+
+#~ 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 ""
+#~ "Zure ordenagailuko fitxategi indexatu guztiek betetzen dituzte hautatu "
+#~ "dituzun irizpideak. Egiaztatu hautapenen ortografia edo zehaztu irizpide "
+#~ "gehiago emaitzak murrizteko."
+
+#~ msgid "Error during search"
+#~ msgstr "Errorea bilaketa egitean"
+
+#~ msgid ""
+#~ "Find cannot open your file system index.  Your index may be missing or "
+#~ "corrupt.  You can create a new index by running \"medusa-indexd\" as root "
+#~ "on the command line."
+#~ msgstr ""
+#~ "Ezin izan da zure fitxategi-sistemaren indizea ireki. Indizea faltako da "
+#~ "edo hondatuta egongo da. Indize berria sor dezakezu komando-lerroan "
+#~ "\"medusa-indexd\" komandoa root gisa exekutatuz."
+
+#~ msgid "Error reading file index"
+#~ msgstr "Errorea fitxategi-indizea irakurtzean"
+
+#~ msgid "An error occurred while loading this search's contents: %s"
+#~ msgstr "Errorea gertatu da bilaketa honen edukia kargatzean: %s"
+
+#~ 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 ""
+#~ "Bilaketa lasterra egiteko, Bilatu-k zure sistemako fitxategien indizea "
+#~ "behar du. Orain ezin du zure indizea atzitu, beraz, indizea erabiltzen ez "
+#~ "duen bilaketa motelago bat egingo du."
+
+#~ 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 ""
+#~ "Edukien bilaketa egiteko, Bilatu-k zure sistemako fitxategien indizea "
+#~ "behar du. Orain ezin du zure indizea atzitu. "
+
+#~ msgid "Fast searches are not available"
+#~ msgstr "Bilaketa lasterrak ez daude erabilgarri"
+
+#~ msgid "Content searches are not available"
+#~ msgstr "Edukien bilaketak ez daude erabilgarri"
+
+#~ 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:\n"
+#~ "\n"
+#~ "medusa-searchd"
+#~ msgstr ""
+#~ "Zure indize-fitxategiak erabilgarri daude, baina indize-eskaerak "
+#~ "kudeatzen dituen Medusa bilaketako daemon-a ez da exekutatzen ari. "
+#~ "Programa hau abiarazteko, hasi saioa root gisa eta idatzi komando hau "
+#~ "komando-lerroan:\n"
+#~ "\n"
+#~ "medusa-searchd"
+
+#~ 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 ""
+#~ "Bilaketa lasterra egiteko, Bilatu-k zure sistemako fitxategien indizea "
+#~ "behar du. Zure ordenagailua indize hori sortzen ari da une honetan. "
+#~ "Indizerik erabili ezin denez, minutu batzuk beharko dira bilaketa egiteko."
+
+#~ 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 ""
+#~ "Edukien bilaketa egiteko, Bilatu-k zure sistemako edukien indizea behar "
+#~ "du. Zure ordenagailua indize hori sortzen ari da une honetan. Edukien "
+#~ "bilaketak erabilgarri egongo dira indizea osatzen denean."
+
+#~ msgid "Indexed searches are not available"
+#~ msgstr "Bilaketa indexatuak ez daude erabilgarri"
+
+#~ msgid ""
+#~ "To do a fast search, Find requires an index of the files on your system.  "
+#~ "No index is available right now. You can create an index by running "
+#~ "\"medusa-indexd\" as root on the command line.  Until a complete index is "
+#~ "available, searches will take several minutes."
+#~ msgstr ""
+#~ "Bilaketa lasterra egiteko, Bilatu-k zure sistemako fitxategien indizea "
+#~ "behar du. Orain ez dago indizerik erabilgarri. Indizea sor dezakezu "
+#~ "komando-lerroan \"medusa-indexd\"  komandoa root gisa exekutatuz. Indize "
+#~ "osoa erabilgarri egon arte, minutu batzuk beharko dira bilaketak egiteko."
+
+#~ msgid ""
+#~ "To do a content search, Find requires an index of the content on your "
+#~ "system.  No index is available right now.  You can create an index by "
+#~ "running \"medusa-indexd\" as root on the command line.  Until a complete "
+#~ "index is available, content searches cannot be performed."
+#~ msgstr ""
+#~ "Edukien bilaketa egiteko, Bilatu-k zure sistemako edukien indizea behar "
+#~ "du. Orain ez dago indize erabilgarririk. Indizea sor dezakezu komando-"
+#~ "lerroan \"medusa-indexd\" komandoa root gisa exekutatuz. Indize osoa "
+#~ "erabilgarri egon arte, ezingo da edukien bilaketarik burutu."
+
+#~ 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 ""
+#~ "Bilaketa lasterra egiteko, Bilatu-k zure sistemako fitxategien indizea "
+#~ "behar du. Sistema-administratzaileak zure ordenagailuko bilaketa lasterra "
+#~ "desgaitu du, beraz, ez dago indizerik erabilgarri."
+
+#~ msgid "Fast searches are not enabled on your computer"
+#~ msgstr "Bilaketa lasterrak ez daude gaituta zure ordenagailuan"
+
+#~ msgid "Where"
+#~ msgstr "Non"
+
+#~ msgid "_Reveal in New Window"
+#~ msgstr "_Erakutsi leiho berrian"
+
+#~ msgid "Reveal in %d _New Windows"
+#~ msgstr "Erakutsi %d _leiho berritan"
+
+#~ msgid ""
+#~ "Nautilus found more search results than it can display. Some matching "
+#~ "items will not be displayed. "
+#~ msgstr ""
+#~ "Nautilus-ek bistaratzeko baino bilaketa-emaitza gehiago aurkitu ditu. "
+#~ "Elementu batzuk ez dira bistaratuko."
+
+#~ msgid "Too Many Matches"
+#~ msgstr "Emaitza gehiegi"
+
+#
+#~ msgid "Dis_ks"
+#~ msgstr "Dis_koak"
+
+#~ msgid "Mount or unmount disks"
+#~ msgstr "Muntatu edo desmuntatu diskoak"
+
+#~ msgid "Choose another viewer with which to view the selected item"
+#~ msgstr "Aukeratu beste ikustaile bat hautatutako elementua ikusteko"
+
+#~ msgid "Indexing is %d%% complete."
+#~ msgstr "Indexazioaren %%%d osatuta dago."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast. "
+#~ msgstr ""
+#~ "Zure fitxategiak eta testu-edukia egunero indexatuko dira, bilaketa "
+#~ "azkarragoa izan dadin. "
+
+#~ msgid "Indexing Status"
+#~ msgstr "Indexazioaren egoera"
+
+#~ msgid "Your files were last indexed at %s"
+#~ msgstr "Zure fitxategien azken indizearen data: %s"
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Zure fitxategiak eta testu-edukia egunero indexatuko dira, bilaketa "
+#~ "azkarragoa izan dadin.  Zure fitxategiak indexatzen ari dira une honetan."
+
+#~ msgid ""
+#~ "When Fast Search is enabled, Find creates an index to speed up searches.  "
+#~ "Fast searching is not enabled on your computer, so you do not have an "
+#~ "index right now."
+#~ msgstr ""
+#~ "Bilaketa lasterra gaituta dagoenean, bilaketak azkartzeko indizea sortzen "
+#~ "du Bilatu-k. Zure ordenagailuak ez du bilaketa lasterra gaituta; beraz, "
+#~ "orain ez duzu indizerik."
+
+#~ msgid "There is no index of your files right now."
+#~ msgstr "Orain ez daukazu fitxategien indizerik."
+
+#~ msgid "Sorry, but the medusa search service is not available."
+#~ msgstr "Medusa bilaketa-zerbitzua ez dago erabilgarri."
+
+#~ msgid "%I:%M %p, %x"
+#~ msgstr "%I:%M %p, %x"
+
+#~ msgid "Reveal each selected item in its original folder"
+#~ msgstr ""
+#~ "Hautatutako elementuetako bakoitza bere jatorrizko karpetan erakusten du"
+
+#~ msgid "Reveal in New Window"
+#~ msgstr "Erakutsi Leiho berrian"
+
+#~ msgid "Show Indexing Status"
+#~ msgstr "Erakutsi indexazioaren egoera"
+
+#~ msgid "Show _Indexing Status"
+#~ msgstr "Erakutsi _indexazioaren egoera"
+
+#~ msgid "Show status of indexing used when searching"
+#~ msgstr "Bilaketetan erabiltzen den indexazioaren egoera erakusten du"
+
+#~ msgid "More Options"
+#~ msgstr "Aukera gehiago"
+
+#~ msgid "Fewer Options"
+#~ msgstr "Aukera gutxiago"
+
+#~ msgid "Find Them!"
+#~ msgstr "Bilatu!"
+
+#
+#~ msgid "_Open activated item in a new window"
+#~ msgstr "_Ireki aktibatutako elementua beste leiho batean"
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "'%s' ez da irudi-fitxategi erabilgarria!"
+
+#~ msgid "[Search for] Name [contains \"fish\"]"
+#~ msgstr "[Bilatu] Izena [\"arraina\" duena]"
+
+#~ msgid "[Search for] Content [includes all of \"fish tree\"]"
+#~ msgstr "[Bilatu] Edukia [hauek denak dituenak\"arraina zuhaitza\"]"
+
+#~ msgid "[Search for] Type [is regular file]"
+#~ msgstr "[Bilatu] Mota [fitxategi erregularra da]"
+
+#~ msgid "[Search for] Size [larger than 400K]"
+#~ msgstr "[Bilatu] Tamaina [400K baino handiagoa]"
+
+#~ msgid "[Search for] With Emblem [includes \"Important\"]"
+#~ msgstr "[Bilatu] Ikurra [\"Garrantzitsua\" duena]"
+
+#~ msgid "[Search for] Last Modified [before yesterday]"
+#~ msgstr "[Bilatu] Aldatze-data [atzo baino lehen]"
+
+#~ msgid "[Search for] Owner [is not root]"
+#~ msgstr "[Bilatu] Jabea [ez da root-a]"
+
+#~ msgid "[File name] contains [help]"
+#~ msgstr "[Fitxategi-izena]k hau du [laguntza]"
+
+#~ msgid "[File name] starts with [nautilus]"
+#~ msgstr "[Fitxategi-izena] honela hasten da: [nautilus]"
+
+#~ msgid "[File name] ends with [.c]"
+#~ msgstr "[Fitxategi-izena] honela amaitzen da: [.c]"
+
+#~ msgid "[File name] matches glob [*.c]"
+#~ msgstr "[Fitxategi-izena] honekin bat dator: [*.c]"
+
+#~ msgid "[File name] matches regexp [\"e??l.$\"]"
+#~ msgstr ""
+#~ "[Fitxategi-izena] adierazpen erregularrarekin bat dator: [\"e??l.$\"]"
+
+#~ msgid "[File content] includes all of [apple orange]"
+#~ msgstr "[Fitxategi-edukia] hauek denak ditu: [sagarra laranja] "
+
+#~ msgid "[File content] includes any of [apply orange]"
+#~ msgstr "[Fitxategi-edukia]k hauetakoren bat du: [sagarra laranja]"
+
+#~ msgid "[File content] does not include all of [apple orange]"
+#~ msgstr "[Fitxategi-edukia]k hauek denak ez ditu: [sagarra laranja]"
+
+#~ msgid "[File content] includes none of [apple orange]"
+#~ msgstr "[Fitxategi-edukia]k hauetako bat ere ez du: [sagarra laranja]"
+
+#~ msgid "[File type] is [folder]"
+#~ msgstr "[Fitxategi-mota] da [karpeta]"
+
+#~ msgid "[File type] is not [folder]"
+#~ msgstr "[Fitxategi-mota] ez da [karpeta]"
+
+#~ msgid "[File type is] regular file"
+#~ msgstr "[Fitxategi-mota da] fitxategi arrunta"
+
+#~ msgid "[File type is] application"
+#~ msgstr "[Fitxategi-mota da] aplikazioa"
+
+#~ msgid "[File type is] folder"
+#~ msgstr "[Fitxategi-mota da] karpeta"
+
+#~ msgid "[File type is] music"
+#~ msgstr "[Fitxategi-mota da] musika"
+
+#~ msgid "[File size is] larger than [400K]"
+#~ msgstr "[Fitxategi-tamaina da] hau baino handiagoa [400K]"
+
+#~ msgid "[File size is] smaller than [300K]"
+#~ msgstr "[Fitxategi-tamaina da] hau baino txikiagoa [300K]"
+
+#~ msgid "[With emblem] marked with [Important]"
+#~ msgstr "[Ikurra]k marka hau du: [Garrantzitsua]"
+
+#~ msgid "[With emblem] not marked with [Important]"
+#~ msgstr "[Ikurra]k marka hau ez du: [Garrantzitsua]"
+
+#~ msgid "[Last modified date] is [1/24/00]"
+#~ msgstr "[Azken aldatze-data] da [00/01/24]"
+
+#~ msgid "[Last modified date] is not [1/24/00]"
+#~ msgstr "[Azken aldatze-data] ez da [00/01/24]"
+
+#~ msgid "[Last modified date] is after [1/24/00]"
+#~ msgstr "[Azken aldatze-data] hau baino geroagokoa [00/01/24]"
+
+#~ msgid "[Last modified date] is before [1/24/00]"
+#~ msgstr "[Azken aldatze-data] hau baino lehenagokoa [00/01/24]"
+
+#~ msgid "[Last modified date] is today"
+#~ msgstr "[Azken aldatze-data:] gaur"
+
+#~ msgid "[Last modified date] is yesterday"
+#~ msgstr "[Azken aldatze-data:] atzo"
+
+#~ msgid "[Last modified date] is within a week of [1/24/00]"
+#~ msgstr "[Azken aldatze-data] egun honen astekoa [00/01/24]"
+
+#~ msgid "[Last modified date] is within a month of [1/24/00]"
+#~ msgstr "[Azken aldatze-data] egun honen hilekoa da [00/1/24]"
+
+#~ msgid "[File owner] is [root]"
+#~ msgstr "[Fitxategi-jabea] da [root]"
+
+#~ msgid "[File owner] is not [root]"
+#~ msgstr "[Fitxategi-jabea:] ez da [root-a]"
+
+#~ msgid ""
+#~ "Couldn't execute nautilus\n"
+#~ "Make sure nautilus is in your path and correctly installed"
+#~ msgstr ""
+#~ "Ezin izan da Nautilus exekutatu\n"
+#~ "Ziurtatu zure bide-izenean dagoela eta ondo instalatuta dagoela"
+
+#~ msgid ""
+#~ "Couldn't connect to URI %s\n"
+#~ "Please make sure that the address is correct and alternatively, type in "
+#~ "this address in the file manager directly"
+#~ msgstr ""
+#~ "Ezin izan da %s URIrekin konektatu\n"
+#~ "Ziurtatu helbidea zuzena dela eta bestela, idatzi helbide hau fitxategi-"
+#~ "kudeatzailean zuzenean"
+
+#~ msgid ""
+#~ "Glade file for the connect to server program is missing.\n"
+#~ "Please check your installation of nautilus"
+#~ msgstr ""
+#~ "Zerbitzarira konektatzeko programaren glade fitxategia falta da.\n"
+#~ "Egiaztatu Nautilus-en instalazioa"
+
+#~ msgid "Add a new server to your Network Servers and connect to it"
+#~ msgstr ""
+#~ "Gehitu beste zerbitzari bat Sareko Zerbitzariei eta konektatu harekin "
+
+#
+#~ msgid "New Server"
+#~ msgstr "Zerbitzari berria"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Change the visibility of this window's toolbar"
+#~ msgstr "Leiho honetako tresna-barra erakusten/ezkutatzen du"
+
+#~ msgid "Go to the Start Here folder"
+#~ msgstr "'Hasi hemen' karpetara joaten da"
+
+#~ msgid "Write contents to a CD"
+#~ msgstr "Idatzi edukia CDan"
+
+#~ msgid "Write to CD"
+#~ msgstr "Idatzi CDan"
+
+#
+#~ msgid "_Backgrounds and Emblems"
+#~ msgstr "A_tzeko planoak eta ikurrak"
+
+#~ msgid "_Close Window"
+#~ msgstr "It_xi leihoa"
+
+#~ msgid "_Find"
+#~ msgstr "Bila_tu"
+
+#~ msgid "_Start Here"
+#~ msgstr "Hasi he_men"
+
+#
+#~ msgid "_Toolbar"
+#~ msgstr "_Tresna-barra"
+
+#
+#~ msgid "_Write to CD"
+#~ msgstr "Idatzi _CDan"
+
+#~ msgid "Find:"
+#~ msgstr "Bilatu:"
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" ez da baliozko helbidea. Egiaztatu ondo idatzita dagoela eta "
+#~ "saiatu berriro."
+
+#~ msgid ""
+#~ "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
+#~ "browser.\n"
+#~ "Check that an SMB server is running in the local network."
+#~ msgstr ""
+#~ "Ezin izan da \"%s\" bistaratu, Nautilus-ek ezin duelako SMB arakatzaile "
+#~ "maisua kontaktatu.\n"
+#~ "Egiaztatu SMB zerbitzaria exekutatzen ari dela sare lokalean."
+
+#~ msgid "Go to Nonexistent Location"
+#~ msgstr "Joan Ez dagoen helbidera"
+
+#
+#~ msgid "Sort in _reverse"
+#~ msgstr "Ordenatu alderantzizko ordenan"
+
+#
+#~ msgid "Use _manual layout"
+#~ msgstr "Erabili diseinu estutua"
+
+#~ msgid "New _Window"
+#~ msgstr "Leiho _berria"
+
+#~ msgid "Your HTTP Proxy requires you to log in.\n"
+#~ msgstr "HTTP proxy-ak saioa has dezazun eskatzen du.\n"
+
+#~ msgid ""
+#~ "You must log in to access \"%s\".\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Saioa hasi behar duzu \"%s\" atzitzeko.\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Your password will be transmitted unencrypted."
+#~ msgstr "Zure pasahitza enkriptatu gabe transmitituko da."
+
+#~ msgid "Your password will be transmitted encrypted."
+#~ msgstr "Zure pasahitza enkriptatuta transmitituko da."
+
+#~ msgid "Authentication Required"
+#~ msgstr "Autentifikazioa behar da"
+
+#~ msgid "You cannot copy the Trash."
+#~ msgstr "Ezin duzu Zakarrontzia kopiatu."
+
+#~ msgid "F_onts"
+#~ msgstr "_Letra-tipoak"
+
+#~ msgid "Lucida"
+#~ msgstr "Lucida"
+
+#~ msgid "Use the Courier Font"
+#~ msgstr "Erabili Courier letra-tipoa"
+
+#~ msgid "Use the Fixed Font"
+#~ msgstr "Erabili letra-tipo finkoa"
+
+#~ msgid "Use the GTK System Font"
+#~ msgstr "Erabili GTK sistemaren letra-tipoa"
+
+#~ msgid "Use the Helvetica Font"
+#~ msgstr "Erabili Helvetica letra-tipoa"
+
+#~ msgid "Use the Lucida Font"
+#~ msgstr "Erabili Lucida letra-tipoa"
+
+#~ msgid "Use the Times Font"
+#~ msgstr "Erabili Times letra-tipoa"
+
+#~ msgid "_Courier"
+#~ msgstr "_Courier"
+
+#~ msgid "_Fixed"
+#~ msgstr "_Finkoa"
+
+#~ msgid "_GTK System Font"
+#~ msgstr "_GTK Sistemaren letra-tipoa"
+
+#~ msgid "_Helvetica"
+#~ msgstr "_Helvetica"
+
+#
+#~ msgid "E_xecute scripts when they are clicked"
+#~ msgstr "Exekutatu fitxategiak klik egiten zaienean"
+
+#
+#~ msgid "_View scripts when they are clicked"
+#~ msgstr "Exekutatu fitxategiak klik egiten zaienean"
+
+#~ msgid "Clear Text"
+#~ msgstr "Garbitu testua"
+
+#~ msgid "Copy Text"
+#~ msgstr "Kopiatu testua"
+
+#~ msgid "Select All"
+#~ msgstr "Hautatu dena"
+
+#~ msgid "Content Loser"
+#~ msgstr "Eduki-galtzailea"
+
+#~ msgid "Content Loser Viewer"
+#~ msgstr "Eduki-galtzailearen ikustailea"
+
+#~ msgid "Nautilus Content Loser"
+#~ msgstr "Nautilus-en eduki-galtzailea"
+
+#~ msgid "Nautilus content loser component's factory"
+#~ msgstr "Nautilus-en eduki-galtzailearen osagaiaren fabrika"
+
+#~ msgid "Nautilus content loser factory"
+#~ msgstr "Nautilus-en eduki-galtzailearen fabrika"
+
+#~ msgid "Nautilus content view that fails on command"
+#~ msgstr "Eskatzean huts egiten duen Nautilus-en eduki-ikuspegia"
+
+#~ msgid "View as Content Loser"
+#~ msgstr "Ikusi Eduki-galtzaile gisa"
+
+#~ msgid "Kill Content Loser"
+#~ msgstr "Hil eduki-galtzailea"
+
+#~ msgid "Kill the Loser content view"
+#~ msgstr "Hil Eduki-galtzailearen ikuspegia"
+
+#~ msgid "_Kill Content Loser"
+#~ msgstr "_Hil Eduki-galtzailea"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "This is a Nautilus content view that fails on demand."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Eskatzean huts egiten duen Nautilus-en eduki-ikuspegi bat da hau. "
+
+#~ msgid "You have tried to kill the Content Loser"
+#~ msgstr "Eduki-galtzailea hiltzen saiatu zara"
+
+#~ msgid "Nautilus Sidebar Loser"
+#~ msgstr "Nautilus-en alboko barraren galtzailea"
+
+#~ msgid "Nautilus sidebar loser component's factory"
+#~ msgstr "Nautilus-en alboko barraren galtzailearen osagaiaren fabrika"
+
+#~ msgid "Nautilus sidebar loser factory"
+#~ msgstr "Nautilus-en alboko barraren galtzailearen fabrika"
+
+#~ msgid "Nautilus sidebar view that fails on command"
+#~ msgstr "Eskatzean huts egiten duen Nautilus-en alboko barraren ikuspegia"
+
+#~ msgid "Sidebar Loser"
+#~ msgstr "Alboko barraren galtzailea"
+
+#~ msgid "Kill Sidebar Loser"
+#~ msgstr "Hil Alboko barraren galtzailea"
+
+#~ msgid "Kill the Loser sidebar panel"
+#~ msgstr "Hil Alboko barraren galtzailearen panela"
+
+#~ msgid "_Kill Sidebar Loser"
+#~ msgstr "_Hil Alboko barraren galtzailea"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Loser sidebar."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Alboko barraren galtzailea. "
+
+#~ msgid "You have tried to kill the Sidebar Loser"
+#~ msgstr "Alboko barraren galtzailea hiltzen saiatu zara"
+
+#~ msgid "Nautilus Sample view"
+#~ msgstr "Nautilus-eko adibidearen ikuspegia"
+
+#~ msgid "Nautilus Sample view factory"
+#~ msgstr "Nautilus-eko adibidearen ikuspegiaren fabrika"
+
+#~ msgid "Sample Viewer"
+#~ msgstr "Adibidearen ikustailea"
+
+#~ msgid "Sample content view component"
+#~ msgstr "Adibidearen eduki-ikuspegiaren osagaia"
+
+#~ msgid "Sample content view component's factory"
+#~ msgstr "Adibidearen eduki-ikuspegiaren osagaiaren fabrika"
+
+#~ msgid "View as Sample"
+#~ msgstr "Ikusi Adibide gisa"
+
+#~ msgid "This is a sample merged menu item"
+#~ msgstr "Fusionatutako menu-elementuen adibidea da hau"
+
+#~ msgid "This is a sample merged toolbar button"
+#~ msgstr "Fusionatutako tresna-barrako botoien adibidea da hau"
+
+#~ msgid "_Sample"
+#~ msgstr "_Adibidea"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "This is a sample Nautilus content view component."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Nautilus-en eduki-ikuspegiaren osagaiaren adibidea da hau. "
+
+#
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "You selected the Sample menu item."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Tresna-barrako Adibidea botoia sakatu duzu. "
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "You clicked the Sample toolbar button."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Tresna-barrako Adibidea botoia sakatu duzu. "
+
+#~ msgid "(none)"
+#~ msgstr "(bat ere ez)"
+
+#~ msgid "No description available for the \"%s\" theme"
+#~ msgstr "Ez dago \"%s\" gaiaren azalpen erabilgarririk"
+
+#
+#~ msgid "New Window Behavior"
+#~ msgstr "Leiho berria"
+
+#
+#~ msgid "New Window Display"
+#~ msgstr "Leiho berria"
+
+#
+#~ msgid "Display _side pane"
+#~ msgstr "Historiaren alboko barraren panela"
+
+#
+#~ msgid "Display _toolbar"
+#~ msgstr "Bistaratu tresna-barra leiho berrietan"
+
+#
+#~ msgid "Display location _bar"
+#~ msgstr "Bistaratu helbide-barra leiho berrietan"
+
+#
+#~ msgid "Display st_atusbar"
+#~ msgstr "Bistaratu %s fitxa alboko barran"
+
+#
+#~ msgid "_Ask before emptying the Trash or deleting files"
+#~ msgstr "Galdetu zakarrontzia hustu edo fitxategiak ezabatu aurretik"
+
+#
+#~ msgid "_Include a Delete command that bypasses Trash"
+#~ msgstr "Sartu Zakarrontzia saltatuko duen Ezabatu komandoa"
+
+#~ msgid "Click Behavior"
+#~ msgstr "Klikaren portaera"
+
+#
+#~ msgid "Show Options"
+#~ msgstr "Erakutsi/Ezkutatu aukerak"
+
+#
+#~ msgid "_Hidden files (filenames starting with \".\")"
+#~ msgstr "Erakutsi fitxategi ezkutuak (izenaren hasieran \".\" dutenak)"
+
+#
+#~ msgid "_Backup files (filenames ending with \"~\")"
+#~ msgstr "Erakutsi babeskopia-fitxategiak (izenaren amaieran \"~\" dutenak)"
+
+#
+#~ msgid "Sort"
+#~ msgstr "Hasi"
+
+#
+#~ msgid "Fo_lders before files"
+#~ msgstr "Zerrendatu beti karpetak fitxategiak baino lehen"
+
+#~ msgid ""
+#~ "Choose the order for information to appear beneath icon names.\n"
+#~ "More information appears as you zoom in closer"
+#~ msgstr ""
+#~ "Aukeratu ikono-izenen azpian agertuko diren datuen ordena.\n"
+#~ "Zoom handiagoarekin informazio gehiago ikusiko da"
+
+#
+#~ msgid "_View new folders using:"
+#~ msgstr "Karpeta berriak ikusteko, erabili:"
+
+#~ msgid "Icon View Defaults"
+#~ msgstr "Ikonoen ikuspegi lehenetsia"
+
+#
+#~ msgid "_Sort in reverse"
+#~ msgstr "Ordenatu alderantzizko ordenan"
+
+#
+#~ msgid "Use co_mpact layout"
+#~ msgstr "Erabili diseinu estutua"
+
+#~ msgid "List View Defaults"
+#~ msgstr "Zerrendaren ikuspegi lehenetsia"
+
+#~ msgid "Search Complexity Options"
+#~ msgstr "Bilaketa-aukerak"
+
+#~ msgid "search type to do by default"
+#~ msgstr "bilaketa-mota lehenetsia"
+
+#~ msgid "Built-in Bookmarks"
+#~ msgstr "Laster-marka inkorporatuak"
+
+#
+#~ msgid "Always show text in icons"
+#~ msgstr "Erakutsi testua ikonoetan"
+
+#
+#~ msgid "Show text in icons for local files"
+#~ msgstr ""
+#~ "Arrastatu eta jaregitea fitxategi-sistema lokalekin bakarrik egin daiteke."
+
+#
+#~ msgid "Always show the number of items in folders"
+#~ msgstr "Erakutsi karpetetako elementu-kopurua"
+
+#
+#~ msgid "Never show the number of items in folders"
+#~ msgstr "Erakutsi karpetetako elementu-kopurua"
+
+#
+#~ msgid "Show thumbnails for local files"
+#~ msgstr "Erakutsi irudi-fitxategien aurrebista txikiak"
+
+#
+#~ msgid "Always preview sound files"
+#~ msgstr "Erakutsi soinu-fitxategien aurrebista"
+
+#
+#~ msgid "Preview local sound files"
+#~ msgstr "Erakutsi soinu-fitxategien aurrebista"
+
+#
+#~ msgid "Never preview sound files"
+#~ msgstr "Erakutsi soinu-fitxategien aurrebista"
+
+#
+#~ msgid "Show Number of Items in Folders"
+#~ msgstr "Erakutsi karpetetako elementu-kopurua"
+
+#
+#~ msgid "_Do not make thumbnails for files larger than:"
+#~ msgstr "Ez egin aurrebista txikirik fitxategia hau baino handiagoa bada:"
+
+#~ msgid "Preview Sound Files"
+#~ msgstr "Erakutsi soinu-fitxategien aurrebista"
+
+#~ msgid "Tabs"
+#~ msgstr "Fitxak"
+
+#~ msgid "Maximum items per site"
+#~ msgstr "Gune bakoitzeko gehieneko elementu-kopurua"
+
+#
+#~ msgid "_Maximum number of items displayed per site"
+#~ msgstr "Gune bakoitzeko gehienez bistara daitekeen elementu-kopurua"
+
+#~ msgid "Update Minutes"
+#~ msgstr "Eguneratzeko maiztasuna"
+
+#
+#~ msgid "_Update frequency in minutes"
+#~ msgstr "Eguneratze-maiztasuna minututan"
+
+#~ msgid "Appearance"
+#~ msgstr "Itxura"
+
+#
+#~ msgid "Desktop & Trash"
+#~ msgstr "Eraman Zakarrontzira"
+
+#~ msgid "Icon & List Views"
+#~ msgstr "Ikono eta Zerrenda ikuspegiak"
+
+#
+#~ msgid "Side Panes"
+#~ msgstr "Alboko barraren panelak"
+
+#~ msgid "Search"
+#~ msgstr "Bilaketa"
+
+#~ msgid "Navigation"
+#~ msgstr "Nabigazioa"
+
+#
+#~ msgid "Performance"
+#~ msgstr "Hobespenak"
+
+#~ msgid "News Panel"
+#~ msgstr "Berrien panela"
+
+#~ msgid "Preferences"
+#~ msgstr "Hobespenak"
+
+#~ msgid "Click on a theme to remove it."
+#~ msgstr "Egin klik kendu nahi duzun gaian."
+
+#~ msgid "Click on a theme to change the appearance of Nautilus."
+#~ msgstr "Egin klik gai batean Nautilus-en itxura aldatzeko."
+
+#~ msgid "Sorry, but \"%s\" is not a valid theme folder."
+#~ msgstr "\"%s\" ez da baliozko gai-karpeta."
+
+#~ msgid "Couldn't add theme"
+#~ msgstr "Ezin izan da gaia gehitu"
+
+#~ msgid "Couldn't install theme"
+#~ msgstr "Ezin da gaia instalatu"
+
+#
+#~ msgid "Sorry, but \"%s\" is not a valid theme file."
+#~ msgstr "\"%s\" ez da baliozko gai-karpeta."
+
+#~ msgid "Select a theme folder to add as a new theme:"
+#~ msgstr "Hautatu gai-karpeta bat gai berri gisa gehitzeko:"
+
+#~ msgid ""
+#~ "Sorry, but you can't remove the current theme. Please change to another "
+#~ "theme before removing this one."
+#~ msgstr ""
+#~ "Ezin duzu uneko gaia kendu. Gaia kendu ahal izateko, beste gai batera "
+#~ "aldatu behar duzu."
+
+#~ msgid "Couldn't remove theme"
+#~ msgstr "Ezin izan da gaia kendu"
+
+#
+#~ msgid "_Add Theme..."
+#~ msgstr "Gehitu gai berria..."
+
+#
+#~ msgid "_Remove Theme..."
+#~ msgstr "Kendu gaia..."
+
+#
+#~ msgid "Cancel _Remove"
+#~ msgstr "Utzi"
+
+#~ msgid "Factory for music view"
+#~ msgstr "Musika-ikuspegiaren fabrika"
+
+#~ msgid "Music"
+#~ msgstr "Musika"
+
+#~ msgid "Music Viewer"
+#~ msgstr "Musika-ikustailea"
+
+#~ msgid "Music view"
+#~ msgstr "Musika-ikuspegia"
+
+#~ msgid "Music view factory"
+#~ msgstr "Musika-ikuspegiaren fabrika"
+
+#~ msgid "View as Music"
+#~ msgstr "Ikusi musika gisa"
+
+#~ msgid "Blues"
+#~ msgstr "Blues-a"
+
+#~ msgid "Classic Rock"
+#~ msgstr "Rock klasikoa"
+
+#~ msgid "Country"
+#~ msgstr "Country-a"
+
+#~ msgid "Dance"
+#~ msgstr "Dance-a"
+
+#~ msgid "Funk"
+#~ msgstr "Funk-a"
+
+#~ msgid "Grunge"
+#~ msgstr "Grunge-a"
+
+#~ msgid "Hip-Hop"
+#~ msgstr "Hip-Hop-a"
+
+#~ msgid "Jazz"
+#~ msgstr "Jazz-a"
+
+#~ msgid "Metal"
+#~ msgstr "Metal-musika"
+
+#~ msgid "New Age"
+#~ msgstr "New Age musika"
+
+#~ msgid "Oldies"
+#~ msgstr "Zaharrak"
+
+#~ msgid "Other"
+#~ msgstr "Bestelakoak"
+
+#~ msgid "Pop"
+#~ msgstr "Pop musika"
+
+#~ msgid "R&B"
+#~ msgstr "R&B"
+
+#~ msgid "Rap"
+#~ msgstr "Rap-a"
+
+#~ msgid "Reggae"
+#~ msgstr "Reggae musika"
+
+#~ msgid "Rock"
+#~ msgstr "Rocka"
+
+#~ msgid "Techno"
+#~ msgstr "Teknoa"
+
+#~ msgid "Industrial"
+#~ msgstr "Industriala"
+
+#~ msgid "Alternative"
+#~ msgstr "Alternatiboa"
+
+#~ msgid "Ska"
+#~ msgstr "Ska"
+
+#~ msgid "Death Metal"
+#~ msgstr "Death Metal musika"
+
+#~ msgid "Pranks"
+#~ msgstr "Pranks musika"
+
+#~ msgid "Soundtrack"
+#~ msgstr "Soinu-banda"
+
+#~ msgid "Euro-Techno"
+#~ msgstr "Euro Teknoa"
+
+#~ msgid "Ambient"
+#~ msgstr "Giroko musika"
+
+#~ msgid "Trip-Hop"
+#~ msgstr "Trip-Hop-a"
+
+#~ msgid "Jazz+Funk"
+#~ msgstr "Jazz+Funk-a"
+
+#~ msgid "Fusion"
+#~ msgstr "Fusion musika"
+
+#~ msgid "Trance"
+#~ msgstr "Trance musika"
+
+#~ msgid "Classical"
+#~ msgstr "Klasikoa"
+
+#~ msgid "Instrumental"
+#~ msgstr "Instrumentala"
+
+#~ msgid "Acid"
+#~ msgstr "Acid musika"
+
+#~ msgid "House"
+#~ msgstr "House musika"
+
+#~ msgid "Game"
+#~ msgstr "Game musika"
+
+#~ msgid "Sound Clip"
+#~ msgstr "Soinu-klipa"
+
+#~ msgid "Gospel"
+#~ msgstr "Gospel-a"
+
+#~ msgid "Noise"
+#~ msgstr "Noise musika"
+
+#~ msgid "Alt"
+#~ msgstr "Alt musika"
+
+#~ msgid "Bass"
+#~ msgstr "Bass musika"
+
+#~ msgid "Soul"
+#~ msgstr "Soul-a"
+
+#~ msgid "Punk"
+#~ msgstr "Punk-a"
+
+#~ msgid "Space"
+#~ msgstr "Space musika"
+
+#~ msgid "Instrumental Pop"
+#~ msgstr "Pop instrumentala"
+
+#~ msgid "Instrumental Rock"
+#~ msgstr "Rock instrumentala"
+
+#~ msgid "Ethnic"
+#~ msgstr "Etnikoa"
+
+#~ msgid "Gothic"
+#~ msgstr "Gotikoa"
+
+#~ msgid "Darkwave"
+#~ msgstr "Darkwave musika"
+
+#~ msgid "Techno-Industrial"
+#~ msgstr "Tekno Industriala"
+
+#~ msgid "Electronic"
+#~ msgstr "Elektronikoa"
+
+#~ msgid "Pop-Folk"
+#~ msgstr "Pop-Folk-a"
+
+#~ msgid "Eurodance"
+#~ msgstr "Eurodance-a"
+
+#~ msgid "Dream"
+#~ msgstr "Dream musika"
+
+#~ msgid "Southern Rock"
+#~ msgstr "Hegoaldeko rocka"
+
+#~ msgid "Comedy"
+#~ msgstr "Komedia"
+
+#~ msgid "Cult"
+#~ msgstr "Kultua"
+
+#~ msgid "Gangsta Rap"
+#~ msgstr "Gangsta Rap musika"
+
+#~ msgid "Top 40"
+#~ msgstr "40 onenak"
+
+#~ msgid "Christian Rap"
+#~ msgstr "Rap kristaua"
+
+#~ msgid "Pop/Funk"
+#~ msgstr "Pop/Funk-a"
+
+#~ msgid "Jungle"
+#~ msgstr "Jungle-a"
+
+#~ msgid "Native American"
+#~ msgstr "Amerikar jatorrikoa"
+
+#~ msgid "Cabaret"
+#~ msgstr "Kabareta"
+
+#~ msgid "Psychedelic"
+#~ msgstr "Psikodelikoa"
+
+#~ msgid "Rave"
+#~ msgstr "Rave musika"
+
+#~ msgid "Showtunes"
+#~ msgstr "Showtunes musika"
+
+#~ msgid "Trailer"
+#~ msgstr "Aurrerakina"
+
+#~ msgid "Lo-Fi"
+#~ msgstr "Lo-Fi-a"
+
+#~ msgid "Tribal"
+#~ msgstr "Tribuak"
+
+#~ msgid "Acid Punk"
+#~ msgstr "Punk azidoa"
+
+#~ msgid "Acid Jazz"
+#~ msgstr "Jazz azidoa"
+
+#~ msgid "Polka"
+#~ msgstr "Polka"
+
+#~ msgid "Retro"
+#~ msgstr "Atzera begirakoa"
+
+#~ msgid "Musical"
+#~ msgstr "Musikala"
+
+#~ msgid "Rock & Roll"
+#~ msgstr "Rock & Roll-a"
+
+#~ msgid "Hard Rock"
+#~ msgstr "Rock gogorra"
+
+#~ msgid "Folk"
+#~ msgstr "Folka"
+
+#~ msgid "Folk/Rock"
+#~ msgstr "Folk/Rock-a"
+
+#~ msgid "National Folk"
+#~ msgstr "Folk nazionala"
+
+#~ msgid "Swing"
+#~ msgstr "Swing musika"
+
+#~ msgid "Fast-Fusion"
+#~ msgstr "Fast-Fusion musika"
+
+#~ msgid "Bebob"
+#~ msgstr "Bebob musika"
+
+#~ msgid "Latin"
+#~ msgstr "Latinoa"
+
+#~ msgid "Revival"
+#~ msgstr "Revival"
+
+#~ msgid "Celtic"
+#~ msgstr "Zelta"
+
+#~ msgid "Bluegrass"
+#~ msgstr "Bluegrass musika"
+
+#~ msgid "Avantgarde"
+#~ msgstr "Abangoardia"
+
+#~ msgid "Gothic Rock"
+#~ msgstr "Rock gotikoa"
+
+#~ msgid "Progressive Rock"
+#~ msgstr "Rock progresiboa"
+
+#~ msgid "Psychedelic Rock"
+#~ msgstr "Rock psikodelikoa"
+
+#~ msgid "Symphonic Rock"
+#~ msgstr "Rock sinfonikoa"
+
+#~ msgid "Slow Rock"
+#~ msgstr "Rock motela"
+
+#~ msgid "Big Band"
+#~ msgstr "Big Band-a"
+
+#~ msgid "Chorus"
+#~ msgstr "Abesbatzak"
+
+#~ msgid "Easy Listening"
+#~ msgstr "Entzuteko erraza"
+
+#~ msgid "Acoustic"
+#~ msgstr "Akustikoa"
+
+#~ msgid "Humour"
+#~ msgstr "Umorezkoa"
+
+#~ msgid "Speech"
+#~ msgstr "Hitzaldia"
+
+#~ msgid "Chanson"
+#~ msgstr "Chanson-a"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Chamber Music"
+#~ msgstr "Ganbera-musika"
+
+#~ msgid "Sonata"
+#~ msgstr "Sonata"
+
+#~ msgid "Symphony"
+#~ msgstr "Sinfonia"
+
+#~ msgid "Booty Bass"
+#~ msgstr "Booty Bass musika"
+
+#~ msgid "Primus"
+#~ msgstr "Primus musika"
+
+#~ msgid "Porn Groove"
+#~ msgstr "Porn Groove"
+
+#~ msgid "Satire"
+#~ msgstr "Satire"
+
+#~ msgid "Slow Jam"
+#~ msgstr "Jam motela"
+
+#~ msgid "Club"
+#~ msgstr "Club musika"
+
+#~ msgid "Tango"
+#~ msgstr "Tangoa"
+
+#~ msgid "Samba"
+#~ msgstr "Samba"
+
+#~ msgid "Folklore"
+#~ msgstr "Folklorea"
+
+#~ msgid "Ballad"
+#~ msgstr "Baladak"
+
+#~ msgid "Power Ballad"
+#~ msgstr "Power baladak"
+
+#~ msgid "Rhythmic Soul"
+#~ msgstr "Soul erritmikoa"
+
+#~ msgid "Duet"
+#~ msgstr "Duet-a"
+
+#~ msgid "Punk Rock"
+#~ msgstr "Punk Rocka"
+
+#~ msgid "Drum Solo"
+#~ msgstr "Bateria bakarlaria"
+
+#~ msgid "A Cappella"
+#~ msgstr "A Cappella"
+
+#~ msgid "Euro-House"
+#~ msgstr "Euro House"
+
+#~ msgid "Dance Hall"
+#~ msgstr "Dantza-aretoa"
+
+#~ msgid "Goa"
+#~ msgstr "Goa"
+
+#~ msgid "Drum & Bass"
+#~ msgstr "Drum & Bass musika"
+
+#~ msgid "Club-House"
+#~ msgstr "Club House"
+
+#~ msgid "Hardcore"
+#~ msgstr "Hardcore-a"
+
+#~ msgid "Terror"
+#~ msgstr "Beldurrezkoa"
+
+#~ msgid "Indie"
+#~ msgstr "Indie musika"
+
+#~ msgid "BritPop"
+#~ msgstr "Britainiako pop-a"
+
+#~ msgid "Negerpunk"
+#~ msgstr "Negerpunk-a"
+
+#~ msgid "Polsk Punk"
+#~ msgstr "Polsk Punk-a"
+
+#~ msgid "Beat"
+#~ msgstr "Beat"
+
+#~ msgid "Christian Gangsta Rap"
+#~ msgstr "Gangsta Rap kristaua"
+
+#~ msgid "Heavy Metal"
+#~ msgstr "Heavy Metal-a"
+
+#~ msgid "Black Metal"
+#~ msgstr "Black Metal"
+
+#~ msgid "Crossover"
+#~ msgstr "Crossover"
+
+#~ msgid "Contemporary Christian"
+#~ msgstr "Kristau garaikidea"
+
+#~ msgid "Christian Rock"
+#~ msgstr "Rock kristaua"
+
+#~ msgid "Merengue"
+#~ msgstr "Merengea"
+
+#~ msgid "Salsa"
+#~ msgstr "Salsa"
+
+#~ msgid "Thrash Metal"
+#~ msgstr "Thrash Metala"
+
+#~ msgid "Anime"
+#~ msgstr "Animatua"
+
+#~ msgid "JPop"
+#~ msgstr "JPop-a"
+
+#~ msgid "Synthpop"
+#~ msgstr "Synthpop"
+
+#~ msgid "Track"
+#~ msgstr "Pista"
+
+#~ msgid "Title"
+#~ msgstr "Izenburua"
+
+#~ msgid "Artist"
+#~ msgstr "Artista"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Bit-abiadura"
+
+#~ msgid "Time"
+#~ msgstr "Denbora"
+
+#~ msgid "Set Cover Image"
+#~ msgstr "Ezarri azaleko irudia"
+
+#~ msgid "Select an image file for the album cover:"
+#~ msgstr "Hautatu albumaren azalerako irudi-fitxategi bat:"
+
+#~ msgid ""
+#~ "Sorry, but the music view is unable to play back sound right now. This is "
+#~ "because the Enable sound server startup setting in the Sound section of "
+#~ "the Control Center is turned off."
+#~ msgstr ""
+#~ "Musika-ikuspegiak ezin du une honetan soinua erreproduzitu.  Kontrol "
+#~ "Zentroko Soinua atalean dagoen Gaitu soinu-zerbitzariaren abiaraztea "
+#~ "ezarpena desaktibatuta dagoelako da. "
+
+#~ msgid "Unable to Play File"
+#~ msgstr "Ezin da fitxategia erreproduzitu"
+
+#~ 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 ""
+#~ "Musika-ikuspegiak ezin du une honetan soinua erreproduzitu.  Beste "
+#~ "programaren bat ari da soinu-txartela erabiltzen edo blokeatzen, edo "
+#~ "bestela, soinu-txartela ez daukazu behar bezala konfiguratuta.  Saiatu "
+#~ "soinu-txartela blokeatzen ari den aplikazioa ixten. "
+
+#~ msgid "Sorry, but the music view can't play non-local files yet."
+#~ msgstr ""
+#~ "Musika-ikuspegiak fitxategi lokalak bakarrik erreproduzi ditzake oraingoz."
+
+#~ msgid "Can't Play Remote Files"
+#~ msgstr "Ezin du urruneko fitxategirik erreproduzitu"
+
+#~ msgid "Drag to seek within track"
+#~ msgstr "Arrastatu pista barruan bilatzeko"
+
+#~ msgid "Previous"
+#~ msgstr "Aurrekoa"
+
+#~ msgid "Play"
+#~ msgstr "Erreproduzitu"
+
+#~ msgid "Pause"
+#~ msgstr "Pausarazi"
+
+#~ msgid "Next"
+#~ msgstr "Hurrengoa"
+
+#
+#~ msgid "cover image"
+#~ msgstr "Ezarri azaleko irudia"
+
+#~ msgid "Sorry, but there was an error reading %s."
+#~ msgstr "Errorea gertatu da %s irakurtzean."
+
+#~ msgid "Delete"
+#~ msgstr "Ezabatu"
+
+#
+#~ msgid "Re_move Custom Icons"
+#~ msgstr "Kendu ikono pertsonalizatua"
+
+#
+#~ msgid "Re_move Custom Icon"
+#~ msgstr "Kendu ikono pertsonalizatua"
+
+#~ msgid "Throw Away"
+#~ msgstr "Bota"
+
+#~ msgid "Remove any custom images from selected icons"
+#~ msgstr "Hautatutako ikonoetako irudi pertsonalizatu guztiak kentzen ditu"
+
+#~ msgid "Factory for news view"
+#~ msgstr "Berrien ikuspegiaren fabrika"
+
+#~ msgid "News"
+#~ msgstr "Berriak"
+
+#~ msgid "News sidebar panel"
+#~ msgstr "Berrien alboko barraren panela"
+
+#~ msgid "News sidebar panel fetches and displays RSS feeds"
+#~ msgstr ""
+#~ "Berrien alboko barraren panelak RSS informazioa bilatu eta bistaratzen du"
+
+#
+#~ msgid "Bullet"
+#~ msgstr "Beat"
+
+#
+#~ msgid "Bullet to display"
+#~ msgstr "Exekutatu edo Bistaratu?"
+
+#~ msgid "%I:%M %p"
+#~ msgstr "%I:%M %p"
+
+#~ msgid "Loading %s"
+#~ msgstr "%s kargatzen"
+
+#~ msgid "Sorry, but you have not specified a name for the site!"
+#~ msgstr "Ez duzu gunearen izena adierazi!"
+
+#~ msgid "Missing Site Name Error"
+#~ msgstr "Gunearen izena falta delako errorea"
+
+#~ msgid "Sorry, but you have not specified a URL for the site!"
+#~ msgstr "Barkatu, baina ez duzu gunearen URLa adierazi!"
+
+#~ msgid "Missing URL Error"
+#~ msgstr "URLa falta delako errorea"
+
+#~ msgid "Sorry, but the specified url doesn't seem to be a valid RSS file!"
+#~ msgstr "Adierazi duzun URLa ez dirudi baliozko RSS fitxategia denik!"
+
+#~ msgid "Invalid RSS URL"
+#~ msgstr "RSSaren URLa ez da baliozkoa"
+
+#
+#~ msgid "Edi_t"
+#~ msgstr "Editatu"
+
+#
+#~ msgid "Site Name"
+#~ msgstr "Gunearen izena:"
+
+#
+#~ msgid "_Remove Site"
+#~ msgstr "Kendu gunea"
+
+#
+#~ msgid "Site _Name:"
+#~ msgstr "Gunearen izena:"
+
+#
+#~ msgid "Site _RSS URL:"
+#~ msgstr "Gunearen RSSaren URLa:"
+
+#
+#~ msgid "_Add New Site"
+#~ msgstr "Gehitu gune berria"
+
+#~ msgid "Add a New Site:"
+#~ msgstr "Gehitu gune berria:"
+
+#
+#~ msgid "Remove a _Site:"
+#~ msgstr "Kendu gunea:"
+
+#
+#~ msgid "_Select Sites:"
+#~ msgstr "Hautatu guneak:"
+
+#
+#~ msgid "_Done"
+#~ msgstr "Eginda"
+
+#~ msgid ""
+#~ "The News panel displays current headlines from your favorite websites.  "
+#~ "Click the 'Select Sites' button to select the sites to display."
+#~ msgstr ""
+#~ "Berrien panelak zure web gune gogokoenen uneko titularrak bistaratzen "
+#~ "ditu.   Sakatu 'Hautatu guneak' botoia bistaratu beharreko guneak "
+#~ "hautatzeko. "
+
+#
+#~ msgid "_Select Sites"
+#~ msgstr "Hautatu guneak"
+
+#~ msgid "image indicating that the news has changed"
+#~ msgstr "berria aldatu egin dela adierazten duen irudia"
+
+#
+#~ msgid "Empty Trash?"
+#~ msgstr "Hustu zakarrontzia"
+
+#~ msgid "Include in the menu just for \"%s\""
+#~ msgstr "Sartu menuan \"%s\"(r)entzat bakarrik"
+
+#~ msgid "Use as default just for \"%s\""
+#~ msgstr "Erabili lehenetsi gisa \"%s\"(r)entzat bakarrik"
+
+#~ msgid "View as Other"
+#~ msgstr "Ikusi beste era batean"
+
+#~ msgid "No applications are available for \"%s\"."
+#~ msgstr "Ez dago aplikazio erabilgarririk \"%s\"(r)entzat."
+
+#~ 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 ""
+#~ "%s\n"
+#~ "\n"
+#~ "Fitxategi-mota bakoitzarentzat zein programa eskaini konfigura dezakezu "
+#~ "GNOMEren kontrol-zentroaren \"Fitxategi-motak eta programak\" atalean.  "
+#~ "Hara joan nahi duzu orain?"
+
+#~ msgid "Empty Trash..."
+#~ msgstr "Hustu zakarrontzia..."
+
+#~ msgid "Delete from _Trash..."
+#~ msgstr "Ezabatu _Zakarrontzitik..."
+
+#~ msgid "De_lete..."
+#~ msgstr "E_zabatu..."
+
+#~ msgid "De_lete"
+#~ msgstr "Eza_batu"
+
+#~ msgid "_Empty Trash..."
+#~ msgstr "_Hustu zakarrontzia..."
+
+#
+#~ msgid "R_emove Custom Icons"
+#~ msgstr "Kendu ikono pertsonalizatua"
+
+#
+#~ msgid "R_emove Custom Icon"
+#~ msgstr "Kendu ikono pertsonalizatua"
+
+#
+#~ msgid "Restore Icons' _Original Sizes"
+#~ msgstr "Berrezarri ikonoen jatorrizko tamaina"
+
+#~ msgid "Text View:"
+#~ msgstr "Testu-ikuspegia:"
+
+#
+#~ msgid "Media Properties Conditionally"
+#~ msgstr "Propietateen leihoa sortzen"
+
+#
+#~ msgid "Unmount Volume Conditionally"
+#~ msgstr "Desmuntatu bolumena"
+
+#~ msgid "Cut Files"
+#~ msgstr "Ebaki fitxategiak"
+
+#~ msgid "New Folder"
+#~ msgstr "Karpeta berria"
+
+#~ msgid "Open Scripts Folder"
+#~ msgstr "Ireki script-en karpeta"
+
+#~ msgid "Other Viewer..."
+#~ msgstr "Beste ikustaile bat..."
+
+#~ msgid "Paste Files"
+#~ msgstr "Itsatsi fitxategiak"
+
+#
+#~ msgid "Reset View to Default"
+#~ msgstr "Zerrendaren ikuspegi lehenetsia"
+
+#~ msgid "Select All Files"
+#~ msgstr "Hautatu fitxategi guztiak"
+
+#~ msgid "Show the contents of the Trash"
+#~ msgstr "Zakarrontziaren edukia erakusten du"
+
+#~ msgid "_Duplicate"
+#~ msgstr "_Bikoiztu"
+
+#~ msgid "_Make Link"
+#~ msgstr "_Sortu esteka"
+
+#~ msgid "_Show Trash"
+#~ msgstr "_Erakutsi zakarrontzia"
+
+#~ msgid "Reversed Order"
+#~ msgstr "Alderantzizko ordena"
+
+#~ msgid "Tighter Layout"
+#~ msgstr "Diseinu estutua"
+
+#~ msgid "_Clean Up by Name"
+#~ msgstr "An_tolatu izenaren arabera"
+
+#~ msgid "_Stretch Icon"
+#~ msgstr "_Tiratu ikonoa"
+
+#~ msgid "Bookmarks"
+#~ msgstr "Laster-markak"
+
+#
+#~ msgid "_Remove"
+#~ msgstr "Kendu"
+
+#~ msgid "Nautilus Themes"
+#~ msgstr "Nautilus gaiak"
+
+#~ msgid "Opening New Windows"
+#~ msgstr "Leiho berriak irekitzean"
+
+#~ msgid "Sorting Order"
+#~ msgstr "Ordenatzeko modua"
+
+#
+#~ msgid "_Show only folders (no files) in the tree"
+#~ msgstr "Karpetak bakarrik erakutsi zuhaitzean (fitxategiak ez)"
+
+#
+#~ msgid "View Defaults"
+#~ msgstr "Ikonoen ikuspegi lehenetsia"
+
+#~ msgid "Speed Tradeoffs"
+#~ msgstr "Abiadura-erlazioak"
+
+#~ msgid "Hide _Toolbar"
+#~ msgstr "Ezkutatu t_resna-barra"
+
+#
+#~ msgid "P_references"
+#~ msgstr "Hobespenak"
+
+#
+#~ msgid "_About Nautilus"
+#~ msgstr "Nautilus-i buruz"
+
+#~ msgid "_Normal Size"
+#~ msgstr "_Tamaina normala"
+
+#~ msgid "_Up a Level"
+#~ msgstr "_Igo maila bat"
+
+#~ msgid "Hide St_atus Bar"
+#~ msgstr "Ezkutatu _egoera-barra"
+
+#~ msgid "Show St_atus Bar"
+#~ msgstr "Erakutsi _egoera-barra"
+
+#~ msgid "Show _Sidebar"
+#~ msgstr "Erakutsi _alboko barra"
+
+#~ msgid "Show Location _Bar"
+#~ msgstr "Erakutsi helbide-_barra"
+
+#
+#~ msgid "Clear"
+#~ msgstr "Urtea"
+
+#~ msgid "Factory for history views"
+#~ msgstr "Historia-ikuspegien fabrika"
+
+#~ msgid "Factory for annotation view"
+#~ msgstr "Oharpenen ikuspegiaren fabrika"
+
+#~ msgid "Delete Trash Contents?"
+#~ msgstr "Zakarrontziaren edukia ezabatu?"
+
+#~ msgid "_Restore Icons' Original Sizes"
+#~ msgstr "Berrezarri iko_noen jatorrizko tamaina"
+
+#~ msgid "Show Properties"
+#~ msgstr "Erakutsi Propietateak"
+
+#~ msgid "Show _Properties"
+#~ msgstr "Erakutsi _Propietateak"
+
+#~ msgid "Font:"
+#~ msgstr "Letra-tipoa:"
+
+#~ msgid "HTTP Proxy Settings"
+#~ msgstr "HTTP Proxy ezarpenak"
+
+#~ msgid "Use HTTP Proxy"
+#~ msgstr "Erabili HTTP proxy-a"
+
+#~ msgid "Proxy requires a username and password:"
+#~ msgstr "Proxy-ak erabiltzailearen izena eta pasahitza behar ditu:"
+
+#~ msgid "Password:"
+#~ msgstr "Pasahitza:"
+
+#~ msgid "Make Folder Appearance Details Public"
+#~ msgstr "Egin publiko karpetaren itxuraren xehetasunak"
+
+#~ msgid "Remove any custom pattern or color from the desktop background"
+#~ msgstr ""
+#~ "Mahaigainaren atzeko planoko eredu edo kolore pertsonalizatu guztiak kendu"
+
+#~ msgid ""
+#~ "Remove any custom pattern or color from the background of this location"
+#~ msgstr ""
+#~ "Kokaleku honetako atzeko planoaren eredu eta kolore pertsonalizatuak "
+#~ "kentzen ditu"
+
+#~ msgid "Display on-line help for Nautilus"
+#~ msgstr "Nautilus-en lineako laguntza bistaratzen du"
+
+#~ msgid "Display quick reference pages for Nautilus"
+#~ msgstr "Nautilus-en erreferentzia azkarreko orrialdeak bistaratzen ditu"
+
+#~ msgid "Go up to the location that contains the displayed location"
+#~ msgstr "Goragoko mailako helbidera joaten da"
+
+#~ msgid "Nautilus Quick _Reference"
+#~ msgstr "Nautilus-en er_referentzia azkarra"
+
+#~ msgid "Nautilus User _Manual"
+#~ msgstr "Nautilus-en erabiltzailearen _eskuliburua"
+
+#
+#~ msgid "P_references..."
+#~ msgstr "Hobespenak"
+
+#~ msgid "_About Nautilus..."
+#~ msgstr "_Nautilus-i buruz..."
+
+#~ msgid "Can't create nautilus-launcher-applet!"
+#~ msgstr "Ezin da nautilus-launcher-applet sortu!"
+
+#~ msgid "Can't create nautilus-preferences-applet!"
+#~ msgstr "Ezin da nautilus-preferences-applet sortu!"
+
+#~ msgid "Show Desktop"
+#~ msgstr "Erakutsi mahaigaina"
+
+#~ msgid "Smooth Graphics"
+#~ msgstr "Leundu grafikoak"
+
+#~ msgid "Quit"
+#~ msgstr "Irten"
+
+#~ msgid "Restart"
+#~ msgstr "Berrabiarazi"
+
+#~ msgid "Help"
+#~ msgstr "Laguntza"
+
+#~ msgid "Help Navigation Tree"
+#~ msgstr "Laguntzan nabigatzeko zuhaitza"
+
+#~ msgid "Help sidebar panel"
+#~ msgstr "Laguntzaren alboko barraren panela"
+
+#~ msgid "Internal use only"
+#~ msgstr "Barne-erabilera bakarrik"
+
+#~ msgid "Table %d."
+#~ msgstr "%d aurkibidea."
+
+#~ msgid "Up to Table of Contents"
+#~ msgstr "Edukien aurkibidera"
+
+#~ msgid "Figure %s"
+#~ msgstr "%s irudia"
+
+#~ msgid "the section here"
+#~ msgstr "hemengo sekzioa"
+
+#~ msgid "Figure %d"
+#~ msgstr "%d irudia"
+
+#~ msgid "IMAGE"
+#~ msgstr "IRUDIA"
+
+#~ msgid "Legal Notice"
+#~ msgstr "Legezko abisua"
+
+#~ msgid "Q"
+#~ msgstr "G"
+
+#~ msgid "A"
+#~ msgstr "E"
+
+#~ msgid "See"
+#~ msgstr "Ikus"
+
+#~ msgid "See also"
+#~ msgstr "Ikus baita ere"
+
+#~ msgid "GNOME Documentation"
+#~ msgstr "GNOMEren dokumentazioa"
+
+#~ msgid "Copyright"
+#~ msgstr "Copyright-a"
+
+#~ msgid "by"
+#~ msgstr "  "
+
+#~ msgid "Table of Contents"
+#~ msgstr "Edukien aurkibidea"
+
+#~ msgid "PREFACE"
+#~ msgstr "HITZAURREA"
+
+#~ msgid "APPENDIX"
+#~ msgstr "ERANSKINA"
+
+#~ msgid "Manual"
+#~ msgstr "Eskuliburua"
+
+#~ msgid "Development"
+#~ msgstr "Garapena"
+
+#~ msgid "System Calls"
+#~ msgstr "Sistema-deiak"
+
+#~ msgid "Library Functions"
+#~ msgstr "Liburutegi-funtzioak"
+
+#~ msgid "Devices"
+#~ msgstr "Gailuak"
+
+#~ msgid "Configuration Files"
+#~ msgstr "Konfigurazio-fitxategiak"
+
+#~ msgid "Games"
+#~ msgstr "Jokoak"
+
+#~ msgid "Conventions"
+#~ msgstr "Konbentzioak"
+
+#~ msgid "System Administration"
+#~ msgstr "Sistema-administrazioa"
+
+#~ msgid "Kernel Routines"
+#~ msgstr "Nukleo-errutinak"
+
+#~ msgid "Info"
+#~ msgstr "Informazioa"
+
+#~ msgid "see "
+#~ msgstr "ikus "
+
+#~ msgid "see also "
+#~ msgstr "ikus baita ere"
+
+#~ msgid "No matches."
+#~ msgstr "Ez dago bat datorrenik."
+
+#~ msgid " (see \""
+#~ msgstr " (ikus \""
+
+#~ msgid " (see also \""
+#~ msgstr " (ikus baita ere \""
+
+#~ msgid "(see: "
+#~ msgstr "(ikus: "
+
+#~ msgid "_Index:"
+#~ msgstr "_Indizea:"
+
+#~ msgid ""
+#~ "Select _documents to show \n"
+#~ "in index tab"
+#~ msgstr ""
+#~ "Hautatu indize-fitxan erakusteko \n"
+#~ "_dokumentuak"
+
+#~ msgid "Select Al_l"
+#~ msgstr "Hautatu d_ena"
+
+#~ msgid "Show indexes for:"
+#~ msgstr "Erakutsi hauen indizeak:"
+
+#~ msgid "_All documents"
+#~ msgstr "_Dokumentu guztiak"
+
+#~ msgid "_Specific documents"
+#~ msgstr "D_okumentu jakin batzuk"
+
+#~ msgid "S_how all index terms"
+#~ msgstr "_Erakutsi indizeko termino guztiak"
+
+#~ msgid "Inde_x:"
+#~ msgstr "Indi_zea:"
+
+#~ msgid "Introductory Documents"
+#~ msgstr "Sarrerako dokumentuak"
+
+#~ msgid "Documents by Subject"
+#~ msgstr "Gaiaren araberako dokumentuak"
+
+#~ msgid "_Index"
+#~ msgstr "_Indizea"
+
+#~ msgid "All Selected"
+#~ msgstr "Hautatutako guztia"
+
+#~ msgid "Contents Selected"
+#~ msgstr "Hautatutako edukia"
+
+#~ msgid "Generic Image Viewer"
+#~ msgstr "Irudi-ikustaile orokorra"
+
+#~ msgid "Generic image control factory"
+#~ msgstr "Irudi-kontrol orokorraren fabrika"
+
+#~ msgid "Image Viewer"
+#~ msgstr "Irudi-ikustailea"
+
+#~ msgid "Nautilus Image Viewer"
+#~ msgstr "Nautilus-en irudi-ikustailea"
+
+#~ msgid "Nautilus Image viewer factory"
+#~ msgstr "Nautilus-en irudi-ikustailearen fabrika"
+
+#~ msgid "View as Image"
+#~ msgstr "Ikusi irudi gisa"
+
+#~ msgid "I could not initialize Bonobo"
+#~ msgstr "Ezin da Bonobo hasieratu"
+
+#~ msgid "Mozilla Nautilus view"
+#~ msgstr "Nautilus-en Mozilla ikuspegia"
+
+#~ msgid "Mozilla Nautilus view factory"
+#~ msgstr "Nautilus-en Mozilla ikuspegiaren fabrika"
+
+#~ msgid "Mozilla content view component"
+#~ msgstr "Mozilla-ren eduki-ikuspegiaren osagaia"
+
+#~ msgid "Mozilla content view component's factory"
+#~ msgstr "Mozilla-ren eduki-ikuspegiaren osagaiaren fabrika"
+
+#~ msgid "View as Web Page"
+#~ msgstr "Ikusi web orri gisa"
+
+#~ msgid "Web Page"
+#~ msgstr "Web orria"
+
+#~ msgid "Web Page Viewer"
+#~ msgstr "Web orrien ikustailea"
+
+#~ msgid ""
+#~ "GConf error:\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "GConf-en errorea:\n"
+#~ "  %s"
+
+#~ msgid ""
+#~ "GConf error:\n"
+#~ "  %s\n"
+#~ "All further errors shown only on terminal"
+#~ msgstr ""
+#~ "GConf-en errorea:\n"
+#~ "  %s\n"
+#~ "Gainerako erroreak terminalean bakarrik agertuko dira"
+
+#~ msgid "mozilla summary info"
+#~ msgstr "mozilla-ri buruzko informazioaren laburpena"
+
+#~ msgid ""
+#~ "A JavaScript function (small software program) on this page tried to open "
+#~ "a new window, but Nautilus does not support the opening new windows by "
+#~ "JavaScript.\n"
+#~ "\n"
+#~ "Try viewing the page in a different web browser, such as Mozilla."
+#~ msgstr ""
+#~ "Orri honetako JavaScript funtzio bat (software-programa txiki bat) leiho "
+#~ "berria irekitzen saiatu da, baina Nautilus-ek ez du onartzen JavaScript "
+#~ "bidez leiho berriak irekitzea.\n"
+#~ "\n"
+#~ "Saiatu orria beste web arakatzaile batekin ikusten, Mozilla-rekin, "
+#~ "adibidez. "
+
+#~ msgid "Nautilus JavaScript Warning"
+#~ msgstr "Nautilus-en JavaScript abisua"
+
+#~ msgid "Arabic"
+#~ msgstr "Arabiarra"
+
+#~ msgid "Baltic"
+#~ msgstr "Baltikokoa"
+
+#~ msgid "Central European"
+#~ msgstr "Europako Erdialdekoa"
+
+#~ msgid "Chinese"
+#~ msgstr "Txinatarra"
+
+#~ msgid "Cyrillic"
+#~ msgstr "Zirilikoa"
+
+#~ msgid "Greek"
+#~ msgstr "Grekoa"
+
+#~ msgid "Hebrew"
+#~ msgstr "Hebrearra"
+
+#~ msgid "Japanese"
+#~ msgstr "Japoniarra"
+
+#~ msgid "Turkish"
+#~ msgstr "Turkiarra"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "UTF"
+#~ msgstr "UTF"
+
+#~ msgid "Vietnamese"
+#~ msgstr "Vietnamdarra"
+
+#~ msgid "Western"
+#~ msgstr "Mendebaldekoa"
+
+#~ msgid "Arabic (IBM-864)"
+#~ msgstr "Arabiarra (IBM-864)"
+
+#~ msgid "Arabic (ISO-8859-6)"
+#~ msgstr "Arabiarra (ISO-8859-6)"
+
+#~ msgid "Arabic (ISO-8859-6-E)"
+#~ msgstr "Arabiarra (ISO-8859-6-E)"
+
+#~ msgid "Arabic (ISO-8859-6-I)"
+#~ msgstr "Arabiarra (ISO-8859-6-I)"
+
+#~ msgid "Arabic (Windows-1256)"
+#~ msgstr "Arabiarra (Windows-1256)"
+
+#~ msgid "Armenian (ARMSCII-8)"
+#~ msgstr "Armeniarra (ARMSCII-8)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltikokoa (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltikokoa (ISO-8859-4)"
+
+#~ msgid "Baltic (Windows-1257)"
+#~ msgstr "Baltikokoa (Windows-1257)"
+
+#~ msgid "Celtic (ISO-8859-14)"
+#~ msgstr "Zeltikoa (ISO-8859-14)"
+
+#~ msgid "Central European (IBM-852)"
+#~ msgstr "Europako Erdialdekoa (IBM-852)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Europako Erdialdekoa (ISO-8859-2)"
+
+#~ msgid "Central European (MacCE)"
+#~ msgstr "Europako Erdialdekoa (MacCE)"
+
+#~ msgid "Central European (Windows-1250)"
+#~ msgstr "Europako Erdialdekoa (Windows-1250)"
+
+#~ msgid "Chinese Simplified (GB2312)"
+#~ msgstr "Txinatar soildua (GB2312)"
+
+#~ msgid "Chinese Simplified (GBK)"
+#~ msgstr "Txinatar soildua (GBK)"
+
+#~ msgid "Chinese Simplified (HZ)"
+#~ msgstr "Txinatar soildua (HZ)"
+
+#~ msgid "Chinese Traditional (Big5)"
+#~ msgstr "Txinatar tradizionala (Big5)"
+
+#~ msgid "Chinese Traditional (EUC-TW)"
+#~ msgstr "Txinatar tradizionala (EUC-TW)"
+
+#~ msgid "Croatian (MacCroatian)"
+#~ msgstr "Kroaziarra (MacCroatian)"
+
+#~ msgid "Cyrillic (IBM-855)"
+#~ msgstr "Zirilikoa (IBM-855)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Zirilikoa (ISO-8859-5)"
+
+#~ msgid "Cyrillic (ISO-IR-111)"
+#~ msgstr "Zirilikoa (ISO-IR-111)"
+
+#~ msgid "Cyrillic (MacCyrillic)"
+#~ msgstr "Zirilikoa (MacCyrillic)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Zirilikoa (Windows-1251)"
+
+#~ msgid "Cyrillic/Russian (IBM-866)"
+#~ msgstr "Zirilikoa/Errusiarra (IBM-866)"
+
+#~ msgid "Cyrillic/Russian (KOI8-R)"
+#~ msgstr "Zirilikoa/Errusiarra (KOI8-R)"
+
+#~ msgid "Cyrillic/Ukrainian (KOI8-U)"
+#~ msgstr "Zirilikoa/Ukrainarra (KOI8-R)"
+
+#~ msgid "Cyrillic/Ukrainian (MacUkrainian)"
+#~ msgstr "Zirilikoa/Ukrainarra (MacUkrainian)"
+
+#~ msgid "English (US-ASCII)"
+#~ msgstr "Ingelesa (US-ASCII)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grekoa (ISO-8859-7)"
+
+#~ msgid "Greek (MacGreek)"
+#~ msgstr "Grekoa (MacGreek)"
+
+#~ msgid "Greek (Windows-1253)"
+#~ msgstr "Grekoa (Windows-1253)"
+
+#~ msgid "Hebrew (IBM-862)"
+#~ msgstr "Hebrearra (IBM-862)"
+
+#~ msgid "Hebrew (ISO-8859-8-E)"
+#~ msgstr "Hebrearra (ISO-8859-8-E)"
+
+#~ msgid "Hebrew (ISO-8859-8-I)"
+#~ msgstr "Hebrearra (ISO-8859-8-I)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Hebrearra (Windows-1255)"
+
+#~ msgid "Icelandic (MacIcelandic)"
+#~ msgstr "Islandiarra (MacIcelandic)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japoniarra (EUC-JP)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japoniarra (ISO-2022-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japoniarra (Shift_JIS)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korearra (EUC-KR)"
+
+#~ msgid "Nordic (ISO-8859-10)"
+#~ msgstr "Nordikoa (ISO-8859-10)"
+
+#~ msgid "Romanian (MacRomanian)"
+#~ msgstr "Errumaniarra (MacRomanian)"
+
+#~ msgid "South European (ISO-8859-3)"
+#~ msgstr "Europako Hegoaldekoa (ISO-8859-3)"
+
+#~ msgid "T.61-8bit"
+#~ msgstr "T.61-8bit"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thaierazkoa (TIS-620)"
+
+#~ msgid "Turkish (IBM-857)"
+#~ msgstr "Turkiarra (IBM-857)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turkiarra (ISO-8859-9)"
+
+#~ msgid "Turkish (MacTurkish)"
+#~ msgstr "Turkiarra (MacTurkish)"
+
+#~ msgid "Turkish (Windows-1254)"
+#~ msgstr "Turkiarra (Windows-1254)"
+
+#~ msgid "Unicode (UTF-7)"
+#~ msgstr "Unicode (UTF-7)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "User Defined"
+#~ msgstr "Erabiltzaileak definitua"
+
+#~ msgid "UTF-16BE"
+#~ msgstr "UTF-16BE"
+
+#~ msgid "UTF-16LE"
+#~ msgstr "UTF-16LE"
+
+#~ msgid "UTF-32BE"
+#~ msgstr "UTF-32BE"
+
+#~ msgid "UTF-32LE"
+#~ msgstr "UTF-32LE"
+
+#~ msgid "Vietnamese (TCVN)"
+#~ msgstr "Vietnamdarra (TCVN)"
+
+#~ msgid "Vietnamese (VISCII)"
+#~ msgstr "Vietnamdarra (VISCII)"
+
+#~ msgid "Vietnamese (VPS)"
+#~ msgstr "Vietnamdarra (VPS)"
+
+#~ msgid "Vietnamese (Windows-1258)"
+#~ msgstr "Vietnamdarra (Windows-1258)"
+
+#~ msgid "Visual Hebrew (ISO-8859-8)"
+#~ msgstr "Hebrear bisuala (ISO-8859-8)"
+
+#~ msgid "Western (IBM-850)"
+#~ msgstr "Mendebaldekoa (IBM-850)"
+
+#~ msgid "Western (ISO-8859-1)"
+#~ msgstr "Mendebaldekoa (ISO-8859-1)"
+
+#~ msgid "Western (ISO-8859-15)"
+#~ msgstr "Mendebaldekoa (ISO-8859-15)"
+
+#~ msgid "Western (MacRoman)"
+#~ msgstr "Mendebaldekoa (MacRoman)"
+
+#~ msgid "Western (Windows-1252)"
+#~ msgstr "Mendebaldekoa (Windows-1252)"
+
+#~ msgid "windows-936"
+#~ msgstr "windows-936"
+
+#~ msgid "x-imap4-modified-utf7"
+#~ msgstr "x-imap4-modified-utf7"
+
+#~ msgid "x-u-escaped"
+#~ msgstr "x-u-escaped"
+
+#~ msgid "Charset Encoding"
+#~ msgstr "Karaktere-kodetzea"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "Ezin da Bonobo hasieratu"
+
+#~ msgid ""
+#~ "This text is read only\n"
+#~ "To edit it, choose an option from the sidebar"
+#~ msgstr ""
+#~ "Testu hau soilik irakurtzeko da\n"
+#~ "Editatzeko, aukeratu alboko barrako aukera bat"
+
+#~ msgid "Sorry, but %s is too large for Nautilus to load all of it."
+#~ msgstr "%s handiegia da eta Nautilus-ek ezin du osorik kargatu."
+
+#~ msgid "File too large"
+#~ msgstr "Fitxategia handiegia da"
+
+#~ msgid "Gnumeric"
+#~ msgstr "Gnumeric"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "The Gimp"
+#~ msgstr "GIMP"
+
+#~ msgid "Home Directory"
+#~ msgstr "Etxeko direktorioa"
+
+#~ msgid "Excite"
+#~ msgstr "Excite"
+
+#~ msgid "Portals"
+#~ msgstr "Atariak"
+
+#~ msgid "Yahoo"
+#~ msgstr "Yahoo"
+
+#~ msgid "Alta Vista"
+#~ msgstr "Alta Vista"
+
+#~ msgid "Google"
+#~ msgstr "Google"
+
+#~ msgid "Search Engines"
+#~ msgstr "Bilatzaileak"
+
+#~ msgid "Programs"
+#~ msgstr "Programak"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Zerbitzari-konfigurazioa"
+
+#~ msgid "Error"
+#~ msgstr "Errorea"
+
+#~ msgid "Question"
+#~ msgstr "Galdera"
+
+#~ msgid "Message."
+#~ msgstr "Mezua."
+
+#~ msgid "Title."
+#~ msgstr "Izenburua."
+
+#~ msgid "Button one label."
+#~ msgstr "1. botoiaren etiketa"
+
+#~ msgid "Button two label."
+#~ msgstr "2. botoiaren etiketa"
+
+#~ msgid "Ok"
+#~ msgstr "Ados"
+
+#~ msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
+#~ msgstr "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
+
+#~ msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+#~ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+
+#~ msgid "search by text"
+#~ msgstr "bilatu testuaren arabera"
+
+#~ msgid "search by text and properties"
+#~ msgstr "bilatu testuaren eta propietateen arabera"
+
+#~ msgid " -_,;.?/&"
+#~ msgstr " -_,;.?/&"
+
+#~ msgid "Undo Typing"
+#~ msgstr "Desegin idazketa"
+
+#~ msgid "Redo Typing"
+#~ msgstr "Berregin idazketa"
+
+#~ msgid "Restore the changed name"
+#~ msgstr "Leheneratu aldatutako izena"
+
+#~ msgid "Nautilus File Manager and Graphic Shell"
+#~ msgstr "Nautilus Fitxategi Kudeatzailea eta Shell grafikoa"
+
+#~ msgid "R_emove Custom Images"
+#~ msgstr "K_endu Irudi pertsonalizatuak"
+
+#~ msgid "R_emove Custom Image"
+#~ msgstr "K_endu Irudi pertsonalizatua"
+
+#~ msgid "Remove Custom Images"
+#~ msgstr "Kendu irudi pertsonalizatuak"
+
+#~ msgid "Reset View to Match _Preferences"
+#~ msgstr "Berrezarri ikuspegia _Hobespenekin bat etortzeko"
+
+#~ msgid "Lay Out Items"
+#~ msgstr "Aurkeztu elementuak"
+
+#~ msgid "_Lay Out Items"
+#~ msgstr "Aurkeztu ele_mentuak"
+
+#~ msgid "Authors"
+#~ msgstr "Egileak"
+
+#~ 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 ""
+#~ "Nautilus root gisa exekutatzera zoaz.\n"
+#~ "\n"
+#~ "Root gisa zabiltzanean, sistema honda dezakezu kontu handiz ez \n"
+#~ "bazabiltza, eta Nautilus-ek ez du ezer egingo hori eragozteko."
+
+#~ msgid ""
+#~ "Your user level adjusts Nautilus to your degree of experience\n"
+#~ "using GNOME and %s. Choose a level that's comfortable for\n"
+#~ "you - you can always change it later."
+#~ msgstr ""
+#~ "Erabiltzaile-mailak GNOME eta %s erabiltzeko duzun eskarmentua\n"
+#~ "adieraziko dio Nautilus-i. Aukera ezazu erosoa zaizun maila \n"
+#~ "- nahi duzunean aldatu ahal izango duzu. "
+
+#~ msgid ""
+#~ "For users who have no previous experience with GNOME\n"
+#~ "and %s."
+#~ msgstr ""
+#~ "GNOME eta %s erabiltzen ohituta ez dauden \n"
+#~ "erabiltzaileentzat. "
+
+#~ msgid ""
+#~ "For users who are comfortable with GNOME and %s,\n"
+#~ "but don't describe themselves as ``technical.''"
+#~ msgstr ""
+#~ "GNOME eta %s erabiltzen eroso sentitzen diren, baina\n"
+#~ "beren burua ``teknikotzat'' ez duten erabiltzaileentzat."
+
+#~ msgid ""
+#~ "For users who have GNOME and %s experience, and\n"
+#~ "like to see every detail of the operating system."
+#~ msgstr ""
+#~ "GNOME eta %s ondo ezagutu, eta sistema eragilearen \n"
+#~ "xehetasun guztiak ezagutu nahi dituztenentzat. "
+
+#~ 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 ""
+#~ "Interneteko konexioa egiaztatzeko eta Nautilus-en azken bertsioa\n"
+#~ "duzula ziurtatzeko, Eazel-en web gunearekin konektatutako da\n"
+#~ "Nautilus orain. Segundo batzuk beharko ditu zure Nautilus-en\n"
+#~ "kopia berria bada; gehixeago (minutu bat edo bi) eguneratzeko\n"
+#~ "premia baduzu.\n"
+#~ "\n"
+#~ "Zure ordenagailuak proxy konexioa erabiltzen duela baldin badakizu,\n"
+#~ "sakatu Egiaztatu eta Nautilus-ek erabili egingo du.\n"
+
+#~ msgid "Verify my connection and check for updates"
+#~ msgstr "Egiaztatu konexioa eta begiratu eguneratzerik dagoen"
+
+#~ msgid "Don't verify my connection or check for updates"
+#~ msgstr "Ez egiaztatu konexioa, ez begiratu eguneratzerik dagoen"
+
+#~ 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 ""
+#~ "Arazoak ditugu kanpoko web konexioa egiteko.\n"
+#~ "Batzuetan, suebakiak web-eko proxy zerbitzaria zehazteko eskatuko dizu.\n"
+#~ "Idatzi hemen zure proxy zerbitzariaren ataka edo izena (horrelakorik "
+#~ "bada)."
+
+#~ msgid "No proxy server required."
+#~ msgstr "Ez da proxy zerbitzaririk behar."
+
+#~ msgid "Use this proxy server:"
+#~ msgstr "Erabili proxy zerbitzari hau:"
+
+#~ msgid "Proxy address:"
+#~ msgstr "Proxy helbidea:"
+
+#~ msgid "Verifying your Internet connection and checking for updates..."
+#~ msgstr ""
+#~ "Internet konexioa egiaztatzen eta eguneratzerik dagoen begiratzen..."
+
+#~ msgid "Downloading Nautilus updates..."
+#~ msgstr "Nautilus-en eguneratzeak deskargatzen..."
+
+#~ 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 ""
+#~ "GNOME Midnight Commander erabili baduzu, ezarpen hauek\n"
+#~ "Nautilus-era eramango dituzte zure mahaigaineko ikonoak\n"
+#~ "eta Nautilus mahaigain lehenetsi bihurtuko dute.\n"
+
+#~ msgid "Use Nautilus to draw the desktop."
+#~ msgstr "Erabili Nautilus mahaigaina marrazteko."
+
+#~ msgid "Move existing desktop icons to the Nautilus desktop."
+#~ msgstr "Eraman mahaigaineko ikonoak Nautilus-en mahaigainera."
+
+#~ msgid "Launch Nautilus when GNOME starts up."
+#~ msgstr "Abiarazi Nautilus GNOME abiarazten denean."
+
+#~ 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 %s user easier.\n"
+#~ "\n"
+#~ "We hope you enjoy Nautilus!"
+#~ msgstr ""
+#~ "Sakatu Amaitu Nautilus abiarazteko. Bi Nautilus leihorekin\n"
+#~ "hasiko zara: batak zure etxeko karpeta erakutsiko du, eta besteak %s \n"
+#~ "erabiltzailearen bizitza errazago egiten duten Eazel zerbitzuen\n"
+#~ "berri emango dizu.\n"
+#~ "\n"
+#~ "Espero dugu Nautilus gogokoa izango duzula!"
+
+#~ 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 ""
+#~ "Sakatu Amaitu Nautilus abiarazteko. Zure etxeko karpeta bistaratuko\n"
+#~ "duen leiho batekin hasiko zara.\n"
+#~ "\n"
+#~ "Espero dugu Nautilus gogokoa izango duzula!"
+
+#~ msgid "Nautilus First Time Setup"
+#~ msgstr "Nautilus-en lehen aldiko konfigurazioa"
+
+#~ msgid "Welcome to Nautilus"
+#~ msgstr "Ongi etorri Nautilus-era"
+
+#~ 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 ""
+#~ "Nautilus...\n"
+#~ "   GNOME mahaigainaren fitxategi-kudeatzaile bikaina da.\n"
+#~ "   Interneteko zerbitzuak atzitzeko modu intuiziozkoa eta erraza.\n"
+#~ "   GNOME garatzaileentzako sistema baliagarria da.\n"
+#~ "   Banaketa-plataforma ahaltsua eskaintzen die zerbitzu-hornitzaileei.\n"
+#~ "\n"
+#~ "Sakatu Hurrengoa zure Nautilus ingurunea pertsonalizatzen hasteko."
+
+#~ msgid "Finished"
+#~ msgstr "Amaituta"
+
+#~ msgid "Choose Your User Level"
+#~ msgstr "Aukeratu zure erabiltzaile-maila"
+
+#~ msgid "GMC to Nautilus Transition"
+#~ msgstr "GMCtik Nautilus-erako trantsizioa"
+
+#~ msgid "Checking Your Internet Connection"
+#~ msgstr "Zure Internet konexioa egiaztatzen"
+
+#~ msgid "Updating Nautilus..."
+#~ msgstr "Nautilus eguneratzen..."
+
+#~ msgid "Web Proxy Configuration"
+#~ msgstr "Web-eko Proxy konfigurazioa"
+
+#~ msgid "Decoding Update..."
+#~ msgstr "Eguneratzea deskodetzen..."
+
+#~ msgid "Update Complete. Click Next to Continue."
+#~ msgstr "Eguneratzea osatuta. Sakatu Hurrengoa jarraitzeko."
+
+#~ msgid "No Update Available... Press Next to Continue."
+#~ msgstr "Ez dago eguneratzerik erabilgarri... Sakatu Hurrengoa jarraitzeko."
+
+#~ msgid "Link sets"
+#~ msgstr "Estekak"
+
+#~ msgid "Add or remove sets of links by clicking on the checkboxes below."
+#~ msgstr ""
+#~ "Gehitu edo kendu esteka-multzoak beheko kontrol-laukietan klik eginez."
+
+#~ msgid "Smoother Graphics"
+#~ msgstr "Grafiko leunduak"
+
+#~ msgid "Use smoother (but slower) graphics"
+#~ msgstr "Erabili grafiko leunduak (motelagoak)"
+
+#~ msgid "Default non-smooth font:"
+#~ msgstr "Letra-tipo ez-leun lehenetsia:"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Laster-teklak"
+
+#~ msgid "Use Emacs-style keyboard shortcuts in text fields"
+#~ msgstr "Erabili Emacs-en estiloko laster-teklak testu-eremuetan"
+
+#~ msgid "Lay Out Items:"
+#~ msgstr "Aurkeztu elementuak:"
+
+#~ msgid "Search Engine Location"
+#~ msgstr "Bilatzailearen helbidea"
+
+#~ msgid " _Advanced"
+#~ msgstr " _Aurreratua"
+
+#~ msgid " _Beginner"
+#~ msgstr " _Hasiberria"
+
+#~ msgid " _Intermediate"
+#~ msgstr " _Tartekoa"
+
+#~ msgid "Display release notes for Nautilus"
+#~ msgstr "Nautilus-en bertsio-oharrak bistaratzen ditu"
+
+#~ msgid "Mailing list where you can send feedback about Nautilus"
+#~ msgstr "Nautilus-i buruzko oharrak bidaltzeko posta-zerrenda"
+
+#~ msgid "Nautilus Release _Notes"
+#~ msgstr "Nautilus-en _bertsio-oharrak"
+
+#~ msgid "Refresh"
+#~ msgstr "Freskatu"
+
+#~ msgid "Search the World Wide Web"
+#~ msgstr "Bilatu World Wide Web-ean"
+
+#~ msgid "Use preferences appropriate for beginners"
+#~ msgstr "Hasiberrientzako hobespen egokiak erabiltzen ditu"
+
+#~ msgid "Use preferences appropriate for experts"
+#~ msgstr "Adituentzako hobespen egokiak erabiltzen ditu"
+
+#~ msgid "Use preferences appropriate for most people"
+#~ msgstr "Jende gehienarentzat egokiak diren hobespenak erabiltzen ditu"
+
+#~ msgid "We_b Search"
+#~ msgstr "We_b bilaketa"
+
+#~ msgid "Web Search"
+#~ msgstr "Web bilaketa"
+
+#~ msgid "_Edit Preferences..."
+#~ msgstr "_Editatu hobespenak..."
+
+#~ msgid "_Feedback"
+#~ msgstr "_Oharrak"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Hobespenak"
+
+#~ msgid "_Refresh"
+#~ msgstr "_Freskatu"
+
+#~ msgid ""
+#~ "Thank you for your interest in Nautilus.\n"
+#~ " \n"
+#~ "As with any software under development, you should exercise caution when "
+#~ "using Nautilus. We do 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 write a mail to <nautilus-list@eazel.com> to provide feedback, "
+#~ "comments, and suggestions."
+#~ msgstr ""
+#~ "Eskerrik asko Nautilus-en jarri duzun interesarengatik.\n"
+#~ "\n"
+#~ "Garatze bidean dagoen beste edozein softwarerekin bezala, arretaz ibili "
+#~ "Nautilus erabiltzen duzunean. Ez dugu inola ere bermatzen behar bezala "
+#~ "funtzionatuko duenik, eta ez dugu gure gain inolako erantzukizunik "
+#~ "hartzen.   Zeure erantzukizun pean erabili beharko duzu.\n"
+#~ "\n"
+#~ "Oharrik, iruzkinik edo iradokizunik egin nahi izanez gero, bidal ezazu "
+#~ "mezua mesedez <nautilus-list@eazel.com> helbidera."
+
+#~ msgid "Preview Release %s: %s"
+#~ msgstr "%s bertsioaren aurrebista: %s"
+
+#~ msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+#~ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+
+#~ msgid "%d%%"
+#~ msgstr "%%%d"
+
+#~ msgid "Help Index"
+#~ msgstr "Laguntzaren indizea"
+
+#~ msgid "Help Index sidebar panel"
+#~ msgstr "Laguntza-indizearen alboko barraren panela"
+
+#~ msgid "Help Search"
+#~ msgstr "Laguntza-bilaketa"
+
+#~ msgid "Help Search sidebar panel"
+#~ msgstr "Laguntza-bilaketaren alboko barraren panela"
+
+#~ msgid "Album"
+#~ msgstr "Albuma"
+
+#~ msgid "Channels"
+#~ msgstr "Kanalak"
+
+#~ msgid "Sample Rate"
+#~ msgstr "Lagin-maiztasuna"
+
+#~ msgid "Stereo"
+#~ msgstr "Estereoa"
+
+#~ msgid "Mono"
+#~ msgstr "Mono"
+
+#~ msgid "foo (11st copy)"
+#~ msgstr "foo (11. kopia)"
+
+#~ msgid "foo (11st copy).txt"
+#~ msgstr "foo (11. kopia).txt"
+
+#~ msgid "foo (12nd copy)"
+#~ msgstr "foo (12. kopia)"
+
+#~ msgid "foo (13rd copy)"
+#~ msgstr "foo (13. kopia)"
+
+#~ msgid "Root"
+#~ msgstr "Erroa"
+
+#~ msgid "UFS Volume"
+#~ msgstr "VFS bolumena"
+
+#~ msgid "is write-protected, mounting read-only"
+#~ msgstr "idazketaren kontra babestuta dago, irakurtzeko soilik muntatzen"
+
+#~ msgid "No medium found"
+#~ msgstr "Ez da euskarririk aurkitu."
+
+#~ msgid "wrong fs type, bad option, bad superblock on"
+#~ msgstr "okerreko fs mota, aukera txarra, superbloke txarra hemen"
+
+#~ msgid "No Scripts Folder"
+#~ msgstr "Script-en karpetarik ez"
+
+#~ msgid "Go to the Eazel Services Summary Page"
+#~ msgstr "Eazel Zerbitzuen Laburpen orrira joaten da"
+
+#~ msgid "Go to the Eazel Software Catalog"
+#~ msgstr "Eazel-en Software katalogora joaten da"
+
+#~ msgid "Go to your online storage repository"
+#~ msgstr "Zure lineako biltegira joaten da"
+
+#~ msgid "Software _Catalog"
+#~ msgstr "Software _katalogoa"
+
+#~ msgid "_Eazel Services Home"
+#~ msgstr "_Eazel zerbitzuen etxea"
+
+#~ msgid "_Online Storage"
+#~ msgstr "_Lineako biltegia"
+
+#~ msgid "_Services"
+#~ msgstr "_Zerbitzuak"
+
+#~ msgid "Display support information for Nautilus and Eazel Services"
+#~ msgstr "Nautilus eta Eazel Zerbitzuen laguntza-informazioa bistaratzen du"
+
+#~ msgid "Go to Eazel Services"
+#~ msgstr "Eazel Zerbitzuetara joaten da"
+
+#~ msgid "_Community Support"
+#~ msgstr "_Komunitatearen laguntza"
diff --git a/po/ko.po b/po/ko.po
index d7be06170..a00b5bfbc 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-15 05:35-0400\n"
+"POT-Creation-Date: 2005-08-30 21:00+0900\n"
 "PO-Revision-Date: 2005-08-30 21:00+0900\n"
 "Last-Translator: Young-Ho Cha <ganadist at gmail dot com>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
@@ -999,7 +999,7 @@ msgstr "�립보드� 저장� 글�를 붙여 넣습니다"
 
 #. name, stock id
 #: ../libnautilus-private/nautilus-clipboard.c:453
-#: ../src/file-manager/fm-directory-view.c:6176
+#: ../src/file-manager/fm-directory-view.c:6224
 msgid "Select _All"
 msgstr "모� 선�(_A)"
 
@@ -1515,8 +1515,8 @@ msgstr "모� 바꾸기(_A)"
 #. * to that kind of file (e.g. "link to folder").
 #.
 #: ../libnautilus-private/nautilus-file-operations.c:1205
-#: ../libnautilus-private/nautilus-file.c:4728
-#: ../src/file-manager/fm-directory-view.c:8479
+#: ../libnautilus-private/nautilus-file.c:4732
+#: ../src/file-manager/fm-directory-view.c:8527
 #, c-format
 msgid "link to %s"
 msgstr "%s� 바로 가기"
@@ -1935,65 +1935,65 @@ msgstr "서비스"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: ../libnautilus-private/nautilus-file.c:2944
+#: ../libnautilus-private/nautilus-file.c:2948
 msgid "today at 00:00:00 PM"
 msgstr "오늘 오후 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2945
+#: ../libnautilus-private/nautilus-file.c:2949
 #: ../src/nautilus-file-management-properties.c:493
 msgid "today at %-I:%M:%S %p"
 msgstr "오늘 %p %l:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:2947
+#: ../libnautilus-private/nautilus-file.c:2951
 msgid "today at 00:00 PM"
 msgstr "오늘 오후 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2948
+#: ../libnautilus-private/nautilus-file.c:2952
 msgid "today at %-I:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: ../libnautilus-private/nautilus-file.c:2950
+#: ../libnautilus-private/nautilus-file.c:2954
 msgid "today, 00:00 PM"
 msgstr "오늘, 오후 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2951
+#: ../libnautilus-private/nautilus-file.c:2955
 msgid "today, %-I:%M %p"
 msgstr "오늘, 오후 %l:%M"
 
-#: ../libnautilus-private/nautilus-file.c:2953
-#: ../libnautilus-private/nautilus-file.c:2954
+#: ../libnautilus-private/nautilus-file.c:2957
+#: ../libnautilus-private/nautilus-file.c:2958
 msgid "today"
 msgstr "오늘"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: ../libnautilus-private/nautilus-file.c:2963
+#: ../libnautilus-private/nautilus-file.c:2967
 msgid "yesterday at 00:00:00 PM"
 msgstr "어제 오후 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2964
+#: ../libnautilus-private/nautilus-file.c:2968
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "어제 %p %l:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:2966
+#: ../libnautilus-private/nautilus-file.c:2970
 msgid "yesterday at 00:00 PM"
 msgstr "어제 오후 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2967
+#: ../libnautilus-private/nautilus-file.c:2971
 msgid "yesterday at %-I:%M %p"
 msgstr "어제 %p %l:%M"
 
-#: ../libnautilus-private/nautilus-file.c:2969
+#: ../libnautilus-private/nautilus-file.c:2973
 msgid "yesterday, 00:00 PM"
 msgstr "어제, 오후 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2970
+#: ../libnautilus-private/nautilus-file.c:2974
 msgid "yesterday, %-I:%M %p"
 msgstr "어제, %p %l:%M"
 
-#: ../libnautilus-private/nautilus-file.c:2972
-#: ../libnautilus-private/nautilus-file.c:2973
+#: ../libnautilus-private/nautilus-file.c:2976
+#: ../libnautilus-private/nautilus-file.c:2977
 msgid "yesterday"
 msgstr "어제"
 
@@ -2002,113 +2002,113 @@ msgstr "어제"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: ../libnautilus-private/nautilus-file.c:2984
+#: ../libnautilus-private/nautilus-file.c:2988
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "0000년 9월 00� 수요� 오후 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2985
+#: ../libnautilus-private/nautilus-file.c:2989
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%Y년 %b %e� %A %p %l:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:2987
+#: ../libnautilus-private/nautilus-file.c:2991
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "0000년 10월 00� (월) 오후 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2988
+#: ../libnautilus-private/nautilus-file.c:2992
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%Y년 %b %e� (%a)  %p %l:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:2990
+#: ../libnautilus-private/nautilus-file.c:2994
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "0000년 10월 00� (월) 오후 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2991
+#: ../libnautilus-private/nautilus-file.c:2995
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%Y년 %b %e� (%a)  %p %l:%M"
 
-#: ../libnautilus-private/nautilus-file.c:2993
+#: ../libnautilus-private/nautilus-file.c:2997
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000 10 00 오후 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2994
+#: ../libnautilus-private/nautilus-file.c:2998
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y년 %b %e� %p %l:%M"
 
-#: ../libnautilus-private/nautilus-file.c:2996
+#: ../libnautilus-private/nautilus-file.c:3000
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000 10 00, 오후 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:2997
+#: ../libnautilus-private/nautilus-file.c:3001
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y년 %b %e�, %p %l:%M"
 
-#: ../libnautilus-private/nautilus-file.c:2999
+#: ../libnautilus-private/nautilus-file.c:3003
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 오후 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:3000
+#: ../libnautilus-private/nautilus-file.c:3004
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%y/%m/%d, %p %l:%M"
 
-#: ../libnautilus-private/nautilus-file.c:3002
+#: ../libnautilus-private/nautilus-file.c:3006
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: ../libnautilus-private/nautilus-file.c:3003
+#: ../libnautilus-private/nautilus-file.c:3007
 msgid "%m/%d/%y"
 msgstr "%y/%m/%d"
 
-#: ../libnautilus-private/nautilus-file.c:4294
+#: ../libnautilus-private/nautilus-file.c:4298
 #: ../src/file-manager/fm-directory-view.c:1933
 #, c-format
 msgid "%u item"
 msgid_plural "%u items"
 msgstr[0] "항목 %u개"
 
-#: ../libnautilus-private/nautilus-file.c:4295
+#: ../libnautilus-private/nautilus-file.c:4299
 #, c-format
 msgid "%u folder"
 msgid_plural "%u folders"
 msgstr[0] "�� %u개"
 
-#: ../libnautilus-private/nautilus-file.c:4296
+#: ../libnautilus-private/nautilus-file.c:4300
 #, c-format
 msgid "%u file"
 msgid_plural "%u files"
 msgstr[0] "파� %u개"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:4621
-#: ../libnautilus-private/nautilus-file.c:4637
+#: ../libnautilus-private/nautilus-file.c:4625
+#: ../libnautilus-private/nautilus-file.c:4641
 msgid "? items"
 msgstr "? 항목"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:4627
+#: ../libnautilus-private/nautilus-file.c:4631
 msgid "? bytes"
 msgstr "? 바�트"
 
-#: ../libnautilus-private/nautilus-file.c:4642
+#: ../libnautilus-private/nautilus-file.c:4646
 msgid "unknown type"
 msgstr "알 수 없는 형�"
 
-#: ../libnautilus-private/nautilus-file.c:4645
+#: ../libnautilus-private/nautilus-file.c:4649
 msgid "unknown MIME type"
 msgstr "알 수 없는 MIME 형�"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: ../libnautilus-private/nautilus-file.c:4651
+#: ../libnautilus-private/nautilus-file.c:4655
 #: ../src/file-manager/fm-properties-window.c:1306
 msgid "unknown"
 msgstr "알 수 없�"
 
-#: ../libnautilus-private/nautilus-file.c:4684
+#: ../libnautilus-private/nautilus-file.c:4688
 msgid "program"
 msgstr "프로그램"
 
-#: ../libnautilus-private/nautilus-file.c:4702
+#: ../libnautilus-private/nautilus-file.c:4706
 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 "
@@ -2117,7 +2117,7 @@ msgstr ""
 "\"x-directory/normal\"� 대한 설명� 찾� 수 없습니다. �것� gnome-vfs.keys "
 "파�� 잘못� 위치� 있거나 다른 �유로 찾� 수 없다는것� �미합니다."
 
-#: ../libnautilus-private/nautilus-file.c:4706
+#: ../libnautilus-private/nautilus-file.c:4710
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -2126,17 +2126,17 @@ msgstr ""
 "mime 형� \"%s\"(파�� \"%s\")� 대한 설명� 찾� 수 없습니다, gnome-vfs 메"
 "�� 리스트로 알려주십시오."
 
-#: ../libnautilus-private/nautilus-file.c:4722
+#: ../libnautilus-private/nautilus-file.c:4726
 msgid "link"
 msgstr "바로 가기"
 
-#: ../libnautilus-private/nautilus-file.c:4742
+#: ../libnautilus-private/nautilus-file.c:4746
 msgid "link (broken)"
 msgstr "바로 가기 (깨어�)"
 
-#: ../libnautilus-private/nautilus-file.c:6170
+#: ../libnautilus-private/nautilus-file.c:6174
 #: ../libnautilus-private/nautilus-global-preferences.c:518
-#: ../libnautilus-private/nautilus-trash-directory.c:353
+#: ../libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "휴지통"
 
@@ -2636,22 +2636,22 @@ msgstr "바탕"
 
 #. name, stock id
 #: ../src/file-manager/fm-desktop-icon-view.c:680
-#: ../src/file-manager/fm-directory-view.c:6154
-#: ../src/file-manager/fm-directory-view.c:6841
+#: ../src/file-manager/fm-directory-view.c:6202
+#: ../src/file-manager/fm-directory-view.c:6889
 msgid "E_mpty Trash"
 msgstr "휴지통 비우기(_M)"
 
 #. label, accelerator
 #. name, stock id
 #: ../src/file-manager/fm-desktop-icon-view.c:692
-#: ../src/file-manager/fm-directory-view.c:6126
+#: ../src/file-manager/fm-directory-view.c:6174
 msgid "Create L_auncher..."
 msgstr "실행 아�콘 만들기(_A)..."
 
 #. tooltip
 #. label, accelerator
 #: ../src/file-manager/fm-desktop-icon-view.c:694
-#: ../src/file-manager/fm-directory-view.c:6127
+#: ../src/file-manager/fm-directory-view.c:6175
 msgid "Create a new launcher"
 msgstr "새 실행 아�콘� 만듭니다"
 
@@ -2674,7 +2674,7 @@ msgstr "휴지통 비우기"
 #. tooltip
 #. label, accelerator
 #: ../src/file-manager/fm-desktop-icon-view.c:708
-#: ../src/file-manager/fm-directory-view.c:6155
+#: ../src/file-manager/fm-directory-view.c:6203
 msgid "Delete all items in the Trash"
 msgstr "휴지통� 있는 모든 항목� 지�니다"
 
@@ -2912,7 +2912,7 @@ msgstr "터미��서 실행(_T)"
 
 #: ../src/file-manager/fm-directory-view.c:4051
 msgid "_Display"
-msgstr "보기(_D)"
+msgstr "표시(_D)"
 
 #: ../src/file-manager/fm-directory-view.c:4054
 msgid "_Run"
@@ -2944,21 +2944,21 @@ msgstr ""
 "고, 파�� 여십시오. 아니면, \"다른 프로그램으로 열기\" 메뉴�서 파�� 열 프"
 "로그램� �접 지정하십시오."
 
-#: ../src/file-manager/fm-directory-view.c:4830
+#: ../src/file-manager/fm-directory-view.c:4878
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "선�한 항목� 대해 \"%s\" 실행"
 
-#: ../src/file-manager/fm-directory-view.c:5079
+#: ../src/file-manager/fm-directory-view.c:5127
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "\"%s\" 형�� 문서 틀� �용하여 문서를 만듭니다."
 
-#: ../src/file-manager/fm-directory-view.c:5285
+#: ../src/file-manager/fm-directory-view.c:5333
 msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "� ��� 모든 실행 파�� 혼잣� 메뉴� 나타날 것입니다."
 
-#: ../src/file-manager/fm-directory-view.c:5287
+#: ../src/file-manager/fm-directory-view.c:5335
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
@@ -2966,11 +2966,11 @@ msgstr ""
 " 메뉴�서 혼잣�� 선�하면 선�한 어떤 항목� 입력으로 하여 혼잣�� 실행할 "
 "것입니다."
 
-#: ../src/file-manager/fm-directory-view.c:5289
+#: ../src/file-manager/fm-directory-view.c:5337
 msgid "About Scripts"
 msgstr "혼잣��"
 
-#: ../src/file-manager/fm-directory-view.c:5290
+#: ../src/file-manager/fm-directory-view.c:5338
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -3010,183 +3010,183 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: 현재 창� 위치와 �기"
 
-#: ../src/file-manager/fm-directory-view.c:5451
+#: ../src/file-manager/fm-directory-view.c:5499
 #: ../src/file-manager/fm-tree-view.c:900
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste command"
 msgstr "\"%s\"�(는) 파�� 붙여 넣� 때 옮길 것입니다."
 
-#: ../src/file-manager/fm-directory-view.c:5455
+#: ../src/file-manager/fm-directory-view.c:5503
 #: ../src/file-manager/fm-tree-view.c:904
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste command"
 msgstr "\"%s\"�(는) 파�� 붙여 넣� 때 복사� 것입니다."
 
-#: ../src/file-manager/fm-directory-view.c:5462
+#: ../src/file-manager/fm-directory-view.c:5510
 #, c-format
 msgid "The %d selected item will be moved if you select the Paste command"
 msgid_plural ""
 "The %d selected items will be moved if you select the Paste command"
 msgstr[0] "선�한 항목 %d개는 파� 붙여 넣� 때 옮겨집니다."
 
-#: ../src/file-manager/fm-directory-view.c:5469
+#: ../src/file-manager/fm-directory-view.c:5517
 #, c-format
 msgid "The %d selected item will be copied if you select the Paste command"
 msgid_plural ""
 "The %d selected items will be copied if you select the Paste command"
 msgstr[0] "선�한 항목 %d개는 파� 붙여 넣� 때 복사�니다."
 
-#: ../src/file-manager/fm-directory-view.c:5563
+#: ../src/file-manager/fm-directory-view.c:5611
 #: ../src/file-manager/fm-tree-view.c:981
 msgid "There is nothing on the clipboard to paste."
 msgstr "�립보드�서 붙여 넣� 것� 없습니다."
 
-#: ../src/file-manager/fm-directory-view.c:5689
-#: ../src/file-manager/fm-directory-view.c:7330
+#: ../src/file-manager/fm-directory-view.c:5737
+#: ../src/file-manager/fm-directory-view.c:7378
 msgid "Mount Error"
 msgstr "마운트 오류"
 
-#: ../src/file-manager/fm-directory-view.c:5746
+#: ../src/file-manager/fm-directory-view.c:5794
 #: ../src/file-manager/fm-tree-view.c:1066
 msgid "Unmount Error"
 msgstr "언마운트 오류"
 
-#: ../src/file-manager/fm-directory-view.c:5759
+#: ../src/file-manager/fm-directory-view.c:5807
 #: ../src/file-manager/fm-tree-view.c:1063
 msgid "Eject Error"
 msgstr "꺼내기 오류"
 
-#: ../src/file-manager/fm-directory-view.c:5908
+#: ../src/file-manager/fm-directory-view.c:5956
 #, c-format
 msgid "Connect to Server %s"
 msgstr "%s 서버� 연결"
 
-#: ../src/file-manager/fm-directory-view.c:5913
+#: ../src/file-manager/fm-directory-view.c:5961
 msgid "_Connect"
 msgstr "ì—°ê²°(_C)"
 
-#: ../src/file-manager/fm-directory-view.c:5927
+#: ../src/file-manager/fm-directory-view.c:5975
 msgid "Link _name:"
 msgstr "바로 가기 �름(_N):"
 
-#: ../src/file-manager/fm-directory-view.c:6100
+#: ../src/file-manager/fm-directory-view.c:6148
 msgid "Create _Document"
 msgstr "문서 만들기(_D)"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6101
+#: ../src/file-manager/fm-directory-view.c:6149
 msgid "Open Wit_h"
 msgstr "다른 프로그램으로 열기(_H)"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6102
+#: ../src/file-manager/fm-directory-view.c:6150
 msgid "Choose a program with which to open the selected item"
 msgstr "선�한 항목� 열 프로그램� 선�합니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6104
-#: ../src/file-manager/fm-directory-view.c:6112
+#: ../src/file-manager/fm-directory-view.c:6152
+#: ../src/file-manager/fm-directory-view.c:6160
 msgid "_Properties"
 msgstr "등� 정보(_P)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6105
+#: ../src/file-manager/fm-directory-view.c:6153
 msgid "View or modify the properties of each selected item"
 msgstr "�� 선�한 항목� 등� 정보를 보거나 고칩니다"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6113
+#: ../src/file-manager/fm-directory-view.c:6161
 msgid "View or modify the properties of the open folder"
 msgstr "열린 ��� 등� 정보를 보거나 고칩니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6116
+#: ../src/file-manager/fm-directory-view.c:6164
 msgid "Create _Folder"
 msgstr "�� 만들기(_F)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6117
+#: ../src/file-manager/fm-directory-view.c:6165
 msgid "Create a new empty folder inside this folder"
 msgstr "� ��안� 새로운 빈 ��를 만듭니다"
 
-#: ../src/file-manager/fm-directory-view.c:6119
+#: ../src/file-manager/fm-directory-view.c:6167
 msgid "No templates Installed"
 msgstr "문서 틀� 설치�지 않았습니다"
 
 #. name, stock id, label
 #. name, stock id
 #. translators: this is used to indicate that a file doesn't contain anything
-#: ../src/file-manager/fm-directory-view.c:6122
+#: ../src/file-manager/fm-directory-view.c:6170
 msgid "_Empty File"
 msgstr "빈 파�(_E)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6123
+#: ../src/file-manager/fm-directory-view.c:6171
 msgid "Create a new empty file inside this folder"
 msgstr "� ��안� 새로운 빈 파�� 만듭니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6130
-#: ../src/file-manager/fm-directory-view.c:6742
+#: ../src/file-manager/fm-directory-view.c:6178
+#: ../src/file-manager/fm-directory-view.c:6790
 #: ../src/file-manager/fm-tree-view.c:1105
 msgid "_Open"
 msgstr "열기(_O)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6131
+#: ../src/file-manager/fm-directory-view.c:6179
 msgid "Open the selected item in this window"
 msgstr "선�한 항목� �창�서 엽니다"
 
 #. name, stock id
 #. Location-specific actions
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6138
-#: ../src/file-manager/fm-directory-view.c:6234
+#: ../src/file-manager/fm-directory-view.c:6186
+#: ../src/file-manager/fm-directory-view.c:6282
 msgid "Open in Navigation Window"
 msgstr "새 찾아보기 창�서 열기"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6139
+#: ../src/file-manager/fm-directory-view.c:6187
 msgid "Open each selected item in a navigation window"
 msgstr "�� 선�한 항목� 새 찾아보기 창�서 엽니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6142
-#: ../src/file-manager/fm-directory-view.c:6146
+#: ../src/file-manager/fm-directory-view.c:6190
+#: ../src/file-manager/fm-directory-view.c:6194
 msgid "Open with Other _Application..."
 msgstr "다른 프로그램으로 열기(_A)..."
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6143
-#: ../src/file-manager/fm-directory-view.c:6147
+#: ../src/file-manager/fm-directory-view.c:6191
+#: ../src/file-manager/fm-directory-view.c:6195
 msgid "Choose another application with which to open the selected item"
 msgstr "선�한 항목� 열 다른 프로그램� 선�합니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6150
+#: ../src/file-manager/fm-directory-view.c:6198
 msgid "_Open Scripts Folder"
 msgstr "혼잣� �� 열기(_O)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6151
+#: ../src/file-manager/fm-directory-view.c:6199
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "� 메뉴�서 보�는 혼잣�� �함하는 �� 보기"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6159
+#: ../src/file-manager/fm-directory-view.c:6207
 msgid "Prepare the selected files to be moved with a Paste command"
 msgstr "파� 붙여 넣기 명령으로 선�� 파�� 옮길 준비를 합니다"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6163
+#: ../src/file-manager/fm-directory-view.c:6211
 msgid "Prepare the selected files to be copied with a Paste command"
 msgstr "파� 붙여 넣기 명령으로 선�� 파�� 복사할 준비를 합니다"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6167
+#: ../src/file-manager/fm-directory-view.c:6215
 msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr ""
 "�전� 선�� 파�� 파� 잘�내기나 파� 복사 명령으로 옮기거나 복사합니다"
@@ -3194,13 +3194,13 @@ msgstr ""
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6172
+#: ../src/file-manager/fm-directory-view.c:6220
 #: ../src/file-manager/fm-tree-view.c:1163
 msgid "_Paste Into Folder"
 msgstr "��� 붙여 넣기(_P)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6173
+#: ../src/file-manager/fm-directory-view.c:6221
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
@@ -3208,284 +3208,284 @@ msgstr ""
 "�전� 파� 잘�내기나 파� 복사 명령으로 선�� 파�� 옮기거나 복사합니다"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6177
+#: ../src/file-manager/fm-directory-view.c:6225
 msgid "Select all items in this window"
 msgstr "� 창� 있는 모든 항목� 선�합니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6180
+#: ../src/file-manager/fm-directory-view.c:6228
 msgid "Select _Pattern"
 msgstr "파��름 형태 선�(_P)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6181
+#: ../src/file-manager/fm-directory-view.c:6229
 msgid "Select items in this window matching a given pattern"
 msgstr "창�서 주어진 파��름 형태� 맞는 항목� 선�합니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6184
+#: ../src/file-manager/fm-directory-view.c:6232
 msgid "D_uplicate"
 msgstr "사본 만들기(_U)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6185
+#: ../src/file-manager/fm-directory-view.c:6233
 msgid "Duplicate each selected item"
 msgstr "�� 선�한 항목� 하나 � 만듭니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6188
-#: ../src/file-manager/fm-directory-view.c:6815
+#: ../src/file-manager/fm-directory-view.c:6236
+#: ../src/file-manager/fm-directory-view.c:6863
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "바로 가기 만들기(_K)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6189
+#: ../src/file-manager/fm-directory-view.c:6237
 msgid "Create a symbolic link for each selected item"
 msgstr "�� 선�한 항목� 다른 파�로 연결합니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6192
+#: ../src/file-manager/fm-directory-view.c:6240
 msgid "_Rename..."
 msgstr "�름 바꾸기(_R)..."
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6193
+#: ../src/file-manager/fm-directory-view.c:6241
 msgid "Rename selected item"
 msgstr "선�� 항목� �름� 바꿉니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6200
 #: ../src/file-manager/fm-directory-view.c:6248
-#: ../src/file-manager/fm-directory-view.c:6616
-#: ../src/file-manager/fm-directory-view.c:6783
-#: ../src/file-manager/fm-directory-view.c:7128
+#: ../src/file-manager/fm-directory-view.c:6296
+#: ../src/file-manager/fm-directory-view.c:6664
+#: ../src/file-manager/fm-directory-view.c:6831
+#: ../src/file-manager/fm-directory-view.c:7176
 msgid "Mo_ve to Trash"
 msgstr "휴지통� 버리기(_V)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6201
-#: ../src/file-manager/fm-directory-view.c:6784
+#: ../src/file-manager/fm-directory-view.c:6249
+#: ../src/file-manager/fm-directory-view.c:6832
 msgid "Move each selected item to the Trash"
 msgstr "�� 선�한 항목� 휴지통� 버립니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6204
 #: ../src/file-manager/fm-directory-view.c:6252
-#: ../src/file-manager/fm-directory-view.c:6802
+#: ../src/file-manager/fm-directory-view.c:6300
+#: ../src/file-manager/fm-directory-view.c:6850
 msgid "_Delete"
 msgstr "지우기(_D)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6205
+#: ../src/file-manager/fm-directory-view.c:6253
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "선�한 항목� 휴지통으로 보내지 않고 지우기"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6208
+#: ../src/file-manager/fm-directory-view.c:6256
 msgid "Reset View to _Defaults"
 msgstr "기본값으로 ��리기(_D)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6209
+#: ../src/file-manager/fm-directory-view.c:6257
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "� 보기�서 정렬 순서와 확대 수준� 기본 설정으로 ��립니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6212
+#: ../src/file-manager/fm-directory-view.c:6260
 msgid "Connect To This Server"
 msgstr "� 서버� 연결"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6213
+#: ../src/file-manager/fm-directory-view.c:6261
 msgid "Make a permanent connection to this server"
 msgstr "� 서버와 연결합니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6216
+#: ../src/file-manager/fm-directory-view.c:6264
 msgid "_Mount Volume"
 msgstr "볼륨 마운트(_M)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6217
+#: ../src/file-manager/fm-directory-view.c:6265
 msgid "Mount the selected volume"
 msgstr "선�한 볼륨� 마운트합니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6220
+#: ../src/file-manager/fm-directory-view.c:6268
 #: ../src/file-manager/fm-tree-view.c:750
 msgid "_Unmount Volume"
 msgstr "볼륨 마운트해제(_U)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6221
+#: ../src/file-manager/fm-directory-view.c:6269
 msgid "Unmount the selected volume"
 msgstr "선�한 볼륨� 마운트 해제합니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6224
+#: ../src/file-manager/fm-directory-view.c:6272
 msgid "_Eject"
 msgstr "꺼내기(_E)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6225
+#: ../src/file-manager/fm-directory-view.c:6273
 msgid "Eject the selected volume"
 msgstr "선�한 볼륨� 꺼냅니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6228
+#: ../src/file-manager/fm-directory-view.c:6276
 msgid "Open File and Close window"
 msgstr "파�� 열고 창� 닫습니다"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6235
+#: ../src/file-manager/fm-directory-view.c:6283
 msgid "Open this folder in a navigation window"
 msgstr "��를 찾아보기 창�서 엽니다"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6240
+#: ../src/file-manager/fm-directory-view.c:6288
 msgid "Prepare this folder to be moved with a Paste command"
 msgstr "파� 붙여 넣기 명령으로 선�� 파�� 옮길 준비를 합니다"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6244
+#: ../src/file-manager/fm-directory-view.c:6292
 msgid "Prepare this folder to be copied with a Paste command"
 msgstr "파� 붙여 넣기 명령으로 선�� 파�� 복사할 준비를 합니다"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6249
+#: ../src/file-manager/fm-directory-view.c:6297
 msgid "Move this folder to the Trash"
 msgstr "� ��를 휴지통� 버립니다"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6253
+#: ../src/file-manager/fm-directory-view.c:6301
 msgid "Delete this folder, without moving to the Trash"
 msgstr "� ��를 휴지통� 버리지 않고 지�니다"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6259
+#: ../src/file-manager/fm-directory-view.c:6307
 msgid "Show _Hidden Files"
 msgstr "숨긴 파� 보기(_H)"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6260
+#: ../src/file-manager/fm-directory-view.c:6308
 msgid "Toggle the display of hidden files in the current window"
 msgstr "현재 창� 숨긴 파�� 표시 여부를 토글합니다"
 
 #. Translators: %s is a directory
-#: ../src/file-manager/fm-directory-view.c:6309
+#: ../src/file-manager/fm-directory-view.c:6357
 #, c-format
 msgid "Run or manage scripts from %s"
 msgstr "%s�서 혼잣�� 실행하거나 관리합니다"
 
 #. Create a script action here specially because its tooltip is dynamic
-#: ../src/file-manager/fm-directory-view.c:6311
+#: ../src/file-manager/fm-directory-view.c:6359
 msgid "_Scripts"
 msgstr "혼잣�(_S)"
 
 #. add the "open in new window" menu item
-#: ../src/file-manager/fm-directory-view.c:6585
-#: ../src/file-manager/fm-directory-view.c:6751
+#: ../src/file-manager/fm-directory-view.c:6633
+#: ../src/file-manager/fm-directory-view.c:6799
 #: ../src/file-manager/fm-tree-view.c:1116
 msgid "Open in New Window"
 msgstr "새 창�서 열기"
 
-#: ../src/file-manager/fm-directory-view.c:6587
-#: ../src/file-manager/fm-directory-view.c:6759
+#: ../src/file-manager/fm-directory-view.c:6635
+#: ../src/file-manager/fm-directory-view.c:6807
 msgid "_Browse Folder"
 msgid_plural "_Browse Folders"
 msgstr[0] "�� 찾아보기(_B)"
 
-#: ../src/file-manager/fm-directory-view.c:6612
-#: ../src/file-manager/fm-directory-view.c:6779
+#: ../src/file-manager/fm-directory-view.c:6660
+#: ../src/file-manager/fm-directory-view.c:6827
 msgid "_Delete from Trash"
 msgstr "휴지통�서 지우기(_D)"
 
-#: ../src/file-manager/fm-directory-view.c:6613
+#: ../src/file-manager/fm-directory-view.c:6661
 msgid "Delete the open folder permanently"
 msgstr "선�한 항목� 모� 지�니다"
 
-#: ../src/file-manager/fm-directory-view.c:6617
+#: ../src/file-manager/fm-directory-view.c:6665
 msgid "Move the open folder to the Trash"
 msgstr "연 ��를 휴지통� 버립니다"
 
-#: ../src/file-manager/fm-directory-view.c:6731
+#: ../src/file-manager/fm-directory-view.c:6779
 #, c-format
 msgid "_Open with \"%s\""
 msgstr "%s 프로그램으로 열기(_O)"
 
-#: ../src/file-manager/fm-directory-view.c:6753
+#: ../src/file-manager/fm-directory-view.c:6801
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "새 창 %d개�서 열기"
 
-#: ../src/file-manager/fm-directory-view.c:6780
+#: ../src/file-manager/fm-directory-view.c:6828
 msgid "Delete all selected items permanently"
 msgstr "선�한 항목� 모� 지�니다"
 
-#: ../src/file-manager/fm-directory-view.c:7119
+#: ../src/file-manager/fm-directory-view.c:7167
 msgid "The link is broken, do you want to move it to the Trash?"
 msgstr "바로 가기가 가리키는 파�� 없습니다. 휴지통� 버리시겠습니까?"
 
-#: ../src/file-manager/fm-directory-view.c:7121
+#: ../src/file-manager/fm-directory-view.c:7169
 msgid "This link can't be used, because it has no target."
 msgstr "� 바로 가기는 가리키는 파�� 없기 때문� 쓸 수 없습니다."
 
-#: ../src/file-manager/fm-directory-view.c:7123
+#: ../src/file-manager/fm-directory-view.c:7171
 #, c-format
 msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr "� 바로 가기는 가리키는 파� \"%s\"�(가) 없기 때문� 쓸 수 없습니다."
 
-#: ../src/file-manager/fm-directory-view.c:7128
+#: ../src/file-manager/fm-directory-view.c:7176
 msgid "Broken Link"
 msgstr "깨진 바로 가기"
 
-#: ../src/file-manager/fm-directory-view.c:7448
+#: ../src/file-manager/fm-directory-view.c:7496
 #, c-format
 msgid "Opening \"%s\"."
 msgstr "\"%s\"�(를) 여는 중."
 
-#: ../src/file-manager/fm-directory-view.c:7455
+#: ../src/file-manager/fm-directory-view.c:7503
 msgid "Cancel Open?"
 msgstr "열기를 취소하시겠습니까?"
 
-#: ../src/file-manager/fm-directory-view.c:8341
+#: ../src/file-manager/fm-directory-view.c:8389
 msgid "Download location?"
 msgstr "위치를 내려 받으시겠습니까?"
 
-#: ../src/file-manager/fm-directory-view.c:8344
+#: ../src/file-manager/fm-directory-view.c:8392
 msgid "You can download it or make a link to it."
 msgstr "내려 받거나 바로 가기를 만들 수 있습니다."
 
-#: ../src/file-manager/fm-directory-view.c:8347
+#: ../src/file-manager/fm-directory-view.c:8395
 msgid "Make a _Link"
 msgstr "바로 가기 만들기(_L)"
 
-#: ../src/file-manager/fm-directory-view.c:8351
+#: ../src/file-manager/fm-directory-view.c:8399
 msgid "_Download"
 msgstr "내려 받기(_D)"
 
-#: ../src/file-manager/fm-directory-view.c:8410
-#: ../src/file-manager/fm-directory-view.c:8463
-#: ../src/file-manager/fm-directory-view.c:8561
+#: ../src/file-manager/fm-directory-view.c:8458
+#: ../src/file-manager/fm-directory-view.c:8511
+#: ../src/file-manager/fm-directory-view.c:8609
 msgid "Drag and drop is not supported."
 msgstr "�어서 놓기는 지��지 않습니다."
 
-#: ../src/file-manager/fm-directory-view.c:8411
+#: ../src/file-manager/fm-directory-view.c:8459
 msgid "Drag and drop is only supported on local file systems."
 msgstr "�어서 놓기는 로컬 파�시스템�서만 지��니다."
 
-#: ../src/file-manager/fm-directory-view.c:8412
-#: ../src/file-manager/fm-directory-view.c:8465
-#: ../src/file-manager/fm-directory-view.c:8563
+#: ../src/file-manager/fm-directory-view.c:8460
+#: ../src/file-manager/fm-directory-view.c:8513
+#: ../src/file-manager/fm-directory-view.c:8611
 msgid "Drag and Drop Error"
 msgstr "�어서 놓기 오류"
 
-#: ../src/file-manager/fm-directory-view.c:8464
-#: ../src/file-manager/fm-directory-view.c:8562
+#: ../src/file-manager/fm-directory-view.c:8512
+#: ../src/file-manager/fm-directory-view.c:8610
 msgid "An invalid drag type was used."
 msgstr "잘못� �기형�� 쓰였습니다."
 
@@ -3860,27 +3860,27 @@ msgstr "표시할 열(_C)..."
 msgid "Select the columns visible in this folder"
 msgstr "� �� 안� 표시할 열� 선�합니다"
 
-#: ../src/file-manager/fm-list-view.c:2732
+#: ../src/file-manager/fm-list-view.c:2730
 msgid "List"
 msgstr "목�"
 
-#: ../src/file-manager/fm-list-view.c:2733
+#: ../src/file-manager/fm-list-view.c:2731
 msgid "View as List"
 msgstr "목�으로 보기"
 
-#: ../src/file-manager/fm-list-view.c:2734
+#: ../src/file-manager/fm-list-view.c:2732
 msgid "View as _List"
 msgstr "목�으로 보기(_L)"
 
-#: ../src/file-manager/fm-list-view.c:2735
+#: ../src/file-manager/fm-list-view.c:2733
 msgid "The list view encountered an error."
 msgstr "목� 보기 오류가 발�하였습니다."
 
-#: ../src/file-manager/fm-list-view.c:2736
+#: ../src/file-manager/fm-list-view.c:2734
 msgid "The list view encountered an error while starting up."
 msgstr "목� 보기가 시작할 때 오류가 발�하였습니다."
 
-#: ../src/file-manager/fm-list-view.c:2737
+#: ../src/file-manager/fm-list-view.c:2735
 msgid "Display this location with the list view."
 msgstr "� 위치를 목� 보기로 보여�니다."
 
diff --git a/po/sv.po b/po/sv.po
index d59e0f88e..f22744ac1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 23:34+0200\n"
-"PO-Revision-Date: 2005-09-18 20:28+0200\n"
+"POT-Creation-Date: 2005-03-22 13:15+0100\n"
+"PO-Revision-Date: 2005-03-22 13:15+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,79 +20,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/browser.xml.h:1
+#: data/browser.xml.h:1
 msgid "Apparition"
 msgstr "Spöke"
 
-#: ../data/browser.xml.h:2
+#: data/browser.xml.h:2
 msgid "Art"
 msgstr "Konst"
 
-#: ../data/browser.xml.h:3
+#: data/browser.xml.h:3
 msgid "Azul"
 msgstr "Azul"
 
-#: ../data/browser.xml.h:4
+#: data/browser.xml.h:4
 msgid "Black"
 msgstr "Svart"
 
-#: ../data/browser.xml.h:5
+#: data/browser.xml.h:5
 msgid "Blue Ridge"
 msgstr "Blå kam"
 
-#: ../data/browser.xml.h:6
+#: data/browser.xml.h:6
 msgid "Blue Rough"
 msgstr "Blå sträv"
 
-#: ../data/browser.xml.h:7
+#: data/browser.xml.h:7
 msgid "Blue Type"
 msgstr "Blå typ"
 
-#: ../data/browser.xml.h:8
+#: data/browser.xml.h:8
 msgid "Brushed Metal"
 msgstr "Polerad metall"
 
-#: ../data/browser.xml.h:9
+#: data/browser.xml.h:9
 msgid "Bubble Gum"
 msgstr "Tuggummi"
 
-#: ../data/browser.xml.h:10
+#: data/browser.xml.h:10
 msgid "Burlap"
 msgstr "Säckväv"
 
-#: ../data/browser.xml.h:11
+#: data/browser.xml.h:11
 msgid "C_olors"
 msgstr "F_ärger"
 
-#: ../data/browser.xml.h:12
+#: data/browser.xml.h:12
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../data/browser.xml.h:13
+#: data/browser.xml.h:13
 msgid "Camouflage"
 msgstr "Kamouflage"
 
-#: ../data/browser.xml.h:14
+#: data/browser.xml.h:14
 msgid "Certified"
 msgstr "Certifierad"
 
-#: ../data/browser.xml.h:15
+#: data/browser.xml.h:15
 msgid "Chalk"
 msgstr "Krita"
 
-#: ../data/browser.xml.h:16
+#: data/browser.xml.h:16
 msgid "Charcoal"
 msgstr "Träkol"
 
-#: ../data/browser.xml.h:17
+#: data/browser.xml.h:17
 msgid "Concrete"
 msgstr "Betong"
 
-#: ../data/browser.xml.h:18
+#: data/browser.xml.h:18
 msgid "Cool"
 msgstr "Häftig"
 
-#: ../data/browser.xml.h:19
+#: data/browser.xml.h:19
 msgid "Cork"
 msgstr "Kork"
 
@@ -103,295 +103,438 @@ msgstr "Kork"
 # depicts a typical 1950's style countertop.  This is translated as
 # "Kontratopp". While literally correct, the original meaning is lost.  A
 # better translation might be "Bänkskiva" or "Skolbänk".
-#: ../data/browser.xml.h:20
+#: data/browser.xml.h:20
 msgid "Countertop"
 msgstr "Bänkskiva"
 
-#: ../data/browser.xml.h:21
+#: data/browser.xml.h:21
 msgid "Danger"
 msgstr "Fara"
 
-#: ../data/browser.xml.h:22
+#: data/browser.xml.h:22
 msgid "Danube"
 msgstr "Donau"
 
-#: ../data/browser.xml.h:23
+#: data/browser.xml.h:23
 msgid "Dark Cork"
 msgstr "Mörk kork"
 
-#: ../data/browser.xml.h:24
+#: data/browser.xml.h:24
 msgid "Dark GNOME"
 msgstr "Mörk GNOME"
 
-#: ../data/browser.xml.h:25
+#: data/browser.xml.h:25
 msgid "Deep Teal"
 msgstr "Mörkt blågrön"
 
-#: ../data/browser.xml.h:26
+#: data/browser.xml.h:26
 msgid "Distinguished"
 msgstr "Utmärkt"
 
-#: ../data/browser.xml.h:27
+#: data/browser.xml.h:27
 msgid "Documents"
 msgstr "Dokument"
 
-#: ../data/browser.xml.h:28
+#: data/browser.xml.h:28
 msgid "Dots"
 msgstr "Prickar"
 
-#: ../data/browser.xml.h:29
+#: data/browser.xml.h:29
 msgid "Draft"
 msgstr "Utkast"
 
-#: ../data/browser.xml.h:30
+#: data/browser.xml.h:30
 msgid "Drag a color to an object to change it to that color"
 msgstr "Dra en färg till ett objekt för att ändra det till den färgen"
 
-#: ../data/browser.xml.h:31
+#: data/browser.xml.h:31
 msgid "Drag a pattern tile to an object to change it"
 msgstr "Dra en mönsterbricka till ett objekt för att ändra det"
 
-#: ../data/browser.xml.h:32
+#: data/browser.xml.h:32
 msgid "Drag an emblem to an object to add it to the object"
 msgstr "Dra ett emblem till ett objekt för att lägga till det till objektet"
 
-#: ../data/browser.xml.h:33
+#: data/browser.xml.h:33
 msgid "Eclipse"
 msgstr "Förmörkelse"
 
-#: ../data/browser.xml.h:34
+#: data/browser.xml.h:34
 msgid "Envy"
 msgstr "Avundsjuka"
 
-#: ../data/browser.xml.h:35 ../src/nautilus-emblem-sidebar.c:941
-#: ../src/nautilus-property-browser.c:1779
+#: data/browser.xml.h:35 src/nautilus-emblem-sidebar.c:941
+#: src/nautilus-property-browser.c:1731
 msgid "Erase"
 msgstr "Ta bort"
 
-#: ../data/browser.xml.h:36
+#: data/browser.xml.h:36
 msgid "Favorite"
 msgstr "Favorit"
 
-#: ../data/browser.xml.h:37
+#: data/browser.xml.h:37
 msgid "Fibers"
 msgstr "Fiber"
 
-#: ../data/browser.xml.h:38
+#: data/browser.xml.h:38
 msgid "Fire Engine"
 msgstr "Brandbil"
 
-#: ../data/browser.xml.h:39
+#: data/browser.xml.h:39
 msgid "Fleur De Lis"
 msgstr "Svärdslilja"
 
-#: ../data/browser.xml.h:40
+#: data/browser.xml.h:40
 msgid "Floral"
 msgstr "Blomster"
 
-#: ../data/browser.xml.h:41
+#: data/browser.xml.h:41
 msgid "Fossil"
 msgstr "Fossil"
 
-#: ../data/browser.xml.h:42
+#: data/browser.xml.h:42
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../data/browser.xml.h:43
+#: data/browser.xml.h:43
 msgid "Granite"
 msgstr "Granit"
 
-#: ../data/browser.xml.h:44
+#: data/browser.xml.h:44
 msgid "Grapefruit"
 msgstr "Grapefrukt"
 
-#: ../data/browser.xml.h:45
+#: data/browser.xml.h:45
 msgid "Green Weave"
 msgstr "Grön väv"
 
-#: ../data/browser.xml.h:46
+#: data/browser.xml.h:46
 msgid "Ice"
 msgstr "Is"
 
-#: ../data/browser.xml.h:47
+#: data/browser.xml.h:47
 msgid "Important"
 msgstr "Viktig"
 
-#: ../data/browser.xml.h:48
+#: data/browser.xml.h:48
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../data/browser.xml.h:49
+#: data/browser.xml.h:49
 msgid "Leaf"
 msgstr "Löv"
 
-#: ../data/browser.xml.h:50
+#: data/browser.xml.h:50
 msgid "Lemon"
 msgstr "Citron"
 
-#: ../data/browser.xml.h:51
+#: data/browser.xml.h:51
 msgid "Mail"
 msgstr "Post"
 
-#: ../data/browser.xml.h:52
+#: data/browser.xml.h:52
 msgid "Mango"
 msgstr "Mango"
 
-#: ../data/browser.xml.h:53
+#: data/browser.xml.h:53
 msgid "Manila Paper"
 msgstr "Kraftpapper"
 
-#: ../data/browser.xml.h:54
+#: data/browser.xml.h:54
 msgid "Moss Ridge"
 msgstr "Mosskam"
 
-#: ../data/browser.xml.h:55
+#: data/browser.xml.h:55
 msgid "Mud"
 msgstr "Lera"
 
-#: ../data/browser.xml.h:56
+#: data/browser.xml.h:56
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../data/browser.xml.h:57
+#: data/browser.xml.h:57
 msgid "New"
 msgstr "Ny"
 
-#: ../data/browser.xml.h:58
+#: data/browser.xml.h:58
 msgid "Numbers"
 msgstr "Tal"
 
-#: ../data/browser.xml.h:59
+#: data/browser.xml.h:59
 msgid "OK"
 msgstr "OK"
 
-#: ../data/browser.xml.h:60
+#: data/browser.xml.h:60
 msgid "Ocean Strips"
 msgstr "Havsremsor"
 
-#: ../data/browser.xml.h:61
+#: data/browser.xml.h:61
 msgid "Oh No"
 msgstr "Ã…nej"
 
-#: ../data/browser.xml.h:62
+#: data/browser.xml.h:62
 msgid "Onyx"
 msgstr "Onyx"
 
-#: ../data/browser.xml.h:63
+#: data/browser.xml.h:63
 msgid "Orange"
 msgstr "Orange"
 
-#: ../data/browser.xml.h:64
+#: data/browser.xml.h:64
 msgid "Package"
 msgstr "Paket"
 
-#: ../data/browser.xml.h:65
+#: data/browser.xml.h:65
 msgid "Pale Blue"
 msgstr "Ljusblå"
 
-#: ../data/browser.xml.h:66
+#: data/browser.xml.h:66
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../data/browser.xml.h:67
+#: data/browser.xml.h:67
 msgid "Pictures"
 msgstr "Bilder"
 
-#: ../data/browser.xml.h:68
+#: data/browser.xml.h:68
 msgid "Purple Marble"
 msgstr "Lila marmor"
 
-#: ../data/browser.xml.h:69
+#: data/browser.xml.h:69
 msgid "Ridged Paper"
 msgstr "Veckat papper"
 
-#: ../data/browser.xml.h:70
+#: data/browser.xml.h:70
 msgid "Rough Paper"
 msgstr "Strävt papper"
 
-#: ../data/browser.xml.h:71
+#: data/browser.xml.h:71
 msgid "Ruby"
 msgstr "Rubin"
 
-#: ../data/browser.xml.h:72
+#: data/browser.xml.h:72
 msgid "Sea Foam"
 msgstr "Havsskum"
 
-#: ../data/browser.xml.h:73
+#: data/browser.xml.h:73
 msgid "Shale"
 msgstr "Skiffer"
 
-#: ../data/browser.xml.h:74
+#: data/browser.xml.h:74
 msgid "Silver"
 msgstr "Silver"
 
-#: ../data/browser.xml.h:75
+#: data/browser.xml.h:75
 msgid "Sky"
 msgstr "Himmel"
 
-#: ../data/browser.xml.h:76
+#: data/browser.xml.h:76
 msgid "Sky Ridge"
 msgstr "Himmelskam"
 
-#: ../data/browser.xml.h:77
+#: data/browser.xml.h:77
 msgid "Snow Ridge"
 msgstr "Snökam"
 
 # Ljud eller sund?
 # http://bugzilla.gnome.org/show_bug.cgi?id=145304
-#. translators: this is the name of an emblem
-#: ../data/browser.xml.h:79
+#: data/browser.xml.h:78
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../data/browser.xml.h:80
+#: data/browser.xml.h:79
 msgid "Special"
 msgstr "Speciell"
 
-#: ../data/browser.xml.h:81
+#: data/browser.xml.h:80
 msgid "Stucco"
 msgstr "Stuck"
 
-#: ../data/browser.xml.h:82
+#: data/browser.xml.h:81
 msgid "Tangerine"
 msgstr "Tangerin"
 
-#: ../data/browser.xml.h:83
+#: data/browser.xml.h:82
 msgid "Terracotta"
 msgstr "Terrakotta"
 
-#: ../data/browser.xml.h:84
+#: data/browser.xml.h:83
 msgid "Urgent"
 msgstr "Brådskande"
 
-#: ../data/browser.xml.h:85
+#: data/browser.xml.h:84
 msgid "Violet"
 msgstr "Lila"
 
-#: ../data/browser.xml.h:86
+#: data/browser.xml.h:85
 msgid "Wavy White"
 msgstr "VÃ¥gig vit"
 
-#: ../data/browser.xml.h:87
+#: data/browser.xml.h:86
 msgid "Web"
 msgstr "Webb"
 
-#: ../data/browser.xml.h:88
+#: data/browser.xml.h:87
 msgid "White"
 msgstr "Vit"
 
-#: ../data/browser.xml.h:89
+#: data/browser.xml.h:88
 msgid "White Ribs"
 msgstr "Vita räfflor"
 
-#: ../data/browser.xml.h:90
+#: data/browser.xml.h:89
 msgid "_Emblems"
 msgstr "_Emblem"
 
-#: ../data/browser.xml.h:91
+#: data/browser.xml.h:90
 msgid "_Patterns"
 msgstr "_Mönster"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:1
+#: libbackground/applier.c:256
+#: libnautilus-private/nautilus-column-utilities.c:58
+msgid "Type"
+msgstr "Typ"
+
+#: libbackground/applier.c:257
+msgid ""
+"Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
+"for preview"
+msgstr ""
+"Typ av bg_applier: BG_APPLIER_ROOT för rotfönstret eller BG_APPLIER_PREVIEW "
+"för förhandsgranskning"
+
+#: libbackground/applier.c:264
+msgid "Preview Width"
+msgstr "Bredd på förhandsvisning"
+
+#: libbackground/applier.c:265
+msgid "Width if applier is a preview: Defaults to 64."
+msgstr "Bredd om verkställaren är en förhandsvisning: Standardvärdet är 64."
+
+#: libbackground/applier.c:272
+msgid "Preview Height"
+msgstr "Höjd på förhandsvisning"
+
+#: libbackground/applier.c:273
+msgid "Height if applier is a preview: Defaults to 48."
+msgstr "Höjd om verkställaren är en förhandsvisning: Standardvärdet är 48."
+
+#: libbackground/applier.c:280
+msgid "Screen"
+msgstr "Skärm"
+
+#: libbackground/applier.c:281
+msgid "Screen on which BGApplier is to draw"
+msgstr "Den skärm som BGApplier ska rita på"
+
+#: libbackground/applier.c:757
+msgid "Disabled"
+msgstr "Inaktiverad"
+
+#: libnautilus-extension/nautilus-column.c:175
+#: libnautilus-extension/nautilus-menu-item.c:206
+#: libnautilus-extension/nautilus-property-page.c:176
+#: libnautilus-private/nautilus-column-utilities.c:43
+#: src/file-manager/fm-list-view.c:1113
+msgid "Name"
+msgstr "Namn"
+
+#: libnautilus-extension/nautilus-column.c:176
+msgid "Name of the column"
+msgstr "Namn på kolumnen"
+
+#: libnautilus-extension/nautilus-column.c:182
+msgid "Attribute"
+msgstr "Attribut"
+
+#: libnautilus-extension/nautilus-column.c:183
+msgid "The attribute name to display"
+msgstr "Attributnamnet att visa"
+
+#: libnautilus-extension/nautilus-column.c:189
+#: libnautilus-extension/nautilus-menu-item.c:213
+#: libnautilus-extension/nautilus-property-page.c:183
+msgid "Label"
+msgstr "Etikett"
+
+#: libnautilus-extension/nautilus-column.c:190
+msgid "Label to display in the column"
+msgstr "Etikett att visa i kolumnen"
+
+#: libnautilus-extension/nautilus-column.c:196
+#: src/file-manager/fm-ditem-page.c:343 src/file-manager/fm-ditem-page.c:354
+msgid "Description"
+msgstr "Beskrivning"
+
+#: libnautilus-extension/nautilus-column.c:197
+msgid "A user-visible description of the column"
+msgstr "En beskrivning av kolumnen som är synlig för användaren"
+
+#: libnautilus-extension/nautilus-column.c:204
+msgid "xalign"
+msgstr "x-justering"
+
+#: libnautilus-extension/nautilus-column.c:205
+msgid "The x-alignment of the column"
+msgstr "Justeringen i x-led för kolumnen"
+
+#: libnautilus-extension/nautilus-menu-item.c:207
+msgid "Name of the item"
+msgstr "Namn på objektet"
+
+#: libnautilus-extension/nautilus-menu-item.c:214
+msgid "Label to display to the user"
+msgstr "Etikett att visa för användaren"
+
+#: libnautilus-extension/nautilus-menu-item.c:220
+msgid "Tip"
+msgstr "Tips"
+
+#: libnautilus-extension/nautilus-menu-item.c:221
+msgid "Tooltip for the menu item"
+msgstr "Verktygstips för menyposten"
+
+#: libnautilus-extension/nautilus-menu-item.c:227
+msgid "Icon"
+msgstr "Ikon"
+
+#: libnautilus-extension/nautilus-menu-item.c:228
+msgid "Name of the icon to display in the menu item"
+msgstr "Namn på ikonen att visa i menyposten"
+
+#: libnautilus-extension/nautilus-menu-item.c:235
+msgid "Sensitive"
+msgstr "Känslig"
+
+#: libnautilus-extension/nautilus-menu-item.c:236
+msgid "Whether the menu item is sensitive"
+msgstr "Huruvida menyposten är käsnlig"
+
+#: libnautilus-extension/nautilus-menu-item.c:242
+msgid "Priority"
+msgstr "Prioritet"
+
+#: libnautilus-extension/nautilus-menu-item.c:243
+msgid "Show priority text in toolbars"
+msgstr "Visa prioritetstext i verktygsrader"
+
+#: libnautilus-extension/nautilus-property-page.c:177
+msgid "Name of the page"
+msgstr "Namn på sidan"
+
+#: libnautilus-extension/nautilus-property-page.c:184
+msgid "Label widget to display in the notebook tab"
+msgstr "Etikettwidget att visa i flikhäftesfliken"
+
+#: libnautilus-extension/nautilus-property-page.c:190
+msgid "Page"
+msgstr "Sida"
+
+#: libnautilus-extension/nautilus-property-page.c:191
+msgid "Widget for the property page"
+msgstr "Widget för egenskapssidan"
+
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:1
 msgid ""
 "A list of captions below an icon in the icon view and the desktop. The "
 "actual number of captions shown depends on the zoom level. Possible values "
@@ -404,19 +547,19 @@ msgstr ""
 "\"type\", \"date_modified\", \"date_changed\", \"date_accessed\", \"owner\", "
 "\"group\", \"permissions\", \"octal_permissions\" och \"mime_type\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
-msgid "Always use the location entry, instead of the pathbar"
-msgstr "Använd alltid platsfältet istället för sökvägsraden"
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
+msgid "Bring up a new window for every opened file"
+msgstr "Visa ett nytt fönster för varje öppnad fil"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
 msgid "Computer icon visible on desktop"
 msgstr "Datorikon synlig på skrivbordet"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
 msgid "Criteria for search bar searching"
 msgstr "Kriterium för sökradssökning"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid ""
 "Criteria when matching files searched for in the search bar. If set to "
 "\"search_by_text\", then Nautilus will Search for files by file name only. "
@@ -428,111 +571,111 @@ msgstr ""
 "namnet. Om detta är satt till \"search_by_text_and_properties\" kommer "
 "Nautilus att söka efter filer både efter namn och filegenskaper."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "Current Nautilus theme (deprecated)"
 msgstr "Aktuellt Nautilus-tema (föråldrat)"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "Custom Background Set"
 msgstr "Anpassad bakgrundssamling"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
 msgid "Custom Side Pane Background Set"
 msgstr "Anpassad sidopanelsbakgrundssamling"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid "Date Format"
 msgstr "Datumformat"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Default Background Color"
 msgstr "Standardbakgrundsfärg"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid "Default Background Filename"
 msgstr "Filnamn för standardbakgrund"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
 msgid "Default Side Pane Background Color"
 msgstr "Standardbakgrundsfärg för sidopanel"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Default Side Pane Background Filename"
 msgstr "Filnamn för sidopanelens standardbakgrund"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
 msgid "Default column order in the list view"
 msgstr "Standardkolumnsortering i listvyn"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
 msgid "Default column order in the list view."
 msgstr "Standardkolumnsortering i listvyn."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
 msgid "Default folder viewer"
 msgstr "Standardmappvisare"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
 msgid "Default icon zoom level"
 msgstr "Standardikonzoomnivå"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Default list of columns visible in the list view"
 msgstr "Standardlista med kolumner synliga i listvyn"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
 msgid "Default list of columns visible in the list view."
 msgstr "Standardlista med kolumner synliga i listvyn."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
 msgid "Default list zoom level"
 msgstr "Standardlistzoomnivå"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
 msgid "Default sort order"
 msgstr "Standardsorteringsordning"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
 msgid "Default zoom level used by the icon view."
 msgstr "Standardzoomnivå som används av ikonvyn."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
 msgid "Default zoom level used by the list view."
 msgstr "Standardzoomnivå som används av listvyn."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Desktop computer icon name"
 msgstr "Namn på skrivbordsdatorikonen"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid "Desktop font"
 msgstr "Skrivbordstypsnitt"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid "Desktop home icon name"
 msgstr "Namn på hemskrivbordsikonen"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Desktop trash icon name"
 msgstr "Namn på papperskorgsskrivbordsikonen"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Aktivera \"specialflaggor\" i filegenskapsfönstret"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
 msgstr ""
 "Aktiverar det klassiska Nautilus-beteendet där alla fönster är bläddrare"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid ""
 "Filename for the default folder background. Only used if background_set is "
 "true."
 msgstr ""
 "Filnamn för standardmappbakgrunden. Används endast om background_set är sant."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -540,7 +683,7 @@ msgstr ""
 "Filnamn för standardsidopanelsbakgrunden. Används endast om "
 "side_pane_background_set är sant."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
 msgid ""
 "Folders over this size will be truncated to around this size. The purpose of "
 "this is to avoid unintentionally blowing the heap and killing Nautilus on "
@@ -553,11 +696,11 @@ msgstr ""
 "negativt värde innebär att ingen gräns finns. Gränsen är ungefärlig på grund "
 "av den styckvisa inläsningen av mappar."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "Home icon visible on desktop"
 msgstr "Hemikon synlig på skrivbordet"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
@@ -565,33 +708,25 @@ msgstr ""
 "Om detta är sant kommer Nautilus endast att visa mappar i trädsidopanelen. "
 "Annars kommer Nautilus att visa både mappar och filer."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
 msgstr "Om detta är sant kommer nyöppnade fönster att ha adressraden synlig."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr "Om detta är sant kommer nyöppnade fönster att ha sidopanelen synlig."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
 msgid "If set to true, newly opened windows will have the status bar visible."
 msgstr "Om detta är sant kommer nyöppnade fönster att ha statusraden synlig."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr ""
 "Om detta är sant kommer nyöppnade fönster att ha verktygsrader synliga."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
-msgid ""
-"If set to true, then Nautilus browser windows will always use a textual "
-"input entry for the location toolbar, instead of the pathbar."
-msgstr ""
-"Om detta är sant kommer Nautilus-bläddrarfönster alltid att ha ett "
-"textinmatningsfält i platsverktygsraden, istället för sökvägsraden."
-
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid ""
 "If set to true, then Nautilus lets you edit some of the more esoteric "
 "options of a file in the file preferences dialog."
@@ -599,14 +734,14 @@ msgstr ""
 "Om detta är sant kommer Nautilus att låta dig redigera några av de mer "
 "exotiska filalternativen i dialogrutan filinställningar."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
 msgstr ""
 "Om detta är sant visar Nautilus mappar innan filer i ikon- och listvyerna."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "put files in the trash."
@@ -614,11 +749,19 @@ msgstr ""
 "Om detta är sant kommer Nautilus att fråga efter bekräftelse när du försöker "
 "placera filer i papperskorgen."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+msgid ""
+"If set to true, then Nautilus will bring up a new Nautilus window by default "
+"whenever an item is opened."
+msgstr ""
+"Om detta är sant visar Nautilus ett nytt Nautilusfönster som standard när "
+"ett objekt öppnas."
+
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "Om detta är sant kommer Nautilus att rita ikonerna på skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
 "If set to true, then Nautilus will have a feature allowing you to delete a "
 "file immediately and in-place, instead of moving it to the trash. This "
@@ -628,7 +771,7 @@ msgstr ""
 "fil permanent och på stället, utan att flytta den till papperskorgen. Denna "
 "funktion kan vara farlig, så var försiktig."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 msgid ""
 "If set to true, then Nautilus will use the user's home folder as the "
 "desktop. If it is false, then it will use ~/Desktop as the desktop."
@@ -636,7 +779,7 @@ msgstr ""
 "Om detta är sant kommer Nautilus att använda användarens hemmapp som "
 "skrivbord. Om det är falskt kommer det att använda ~/Desktop som skrivbord."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
 "If set to true, then all Nautilus windows will be browser windows. This is "
 "how Nautilus used to behave before version 2.6, and some people prefer this "
@@ -646,7 +789,7 @@ msgstr ""
 "Detta är hur Nautilus brukade bete sig innan version 2.6, och en del "
 "användare föredrar detta beteende."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
 "If set to true, then backup files such as those created by Emacs are "
 "displayed. Currently, only files ending in a tilde (~) are considered backup "
@@ -656,7 +799,7 @@ msgstr ""
 "Emacs att visas. För tillfället betraktas endast de filer som slutar med ett "
 "tildetecken (~) som säkerhetskopior."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
 "files are either dotfiles or are listed in the folder's .hidden file."
@@ -664,7 +807,7 @@ msgstr ""
 "Om detta är sant kommer dolda filer att visas i filhanteraren. Dolda filer "
 "är antingen punktfiler eller är listade i mappens .hidden-fil."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
@@ -672,7 +815,7 @@ msgstr ""
 "Om detta är sant kommer en ikon som länkar till datorns plats att placeras "
 "på skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
@@ -680,7 +823,7 @@ msgstr ""
 "Om detta är sant kommer en ikon som länkar till hemmappen att placeras på "
 "skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
@@ -688,7 +831,7 @@ msgstr ""
 "Om detta är sant kommer en ikon som länkar till papperskorgen att placeras "
 "på skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
@@ -696,7 +839,7 @@ msgstr ""
 "Om detta är sant kommer ikoner som länkar till de monterade volymerna att "
 "placeras på skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid ""
 "If true, files in new windows will be sorted in reverse order. ie, if sorted "
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
@@ -706,7 +849,7 @@ msgstr ""
 "dvs om de sorteras efter namn kommer de att istället för att sorteras från "
 "\"a\" till \"ö\" att sorteras från \"ö\" till \"a\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
 "If true, files in new windows will be sorted in reverse order. ie, if sorted "
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
@@ -719,25 +862,25 @@ msgstr ""
 "sorteras efter storlek kommer de att sorteras efter ökande storlek istället "
 "för efter minskande storlek."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Om detta är sant kommer ikoner att placeras tätare som standard i nya "
 "fönster."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid ""
 "If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "Om detta är sant kommer etiketter att placeras bredvid ikoner istället för "
 "under dem."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid "If true, new windows will use manual layout by default."
 msgstr ""
 "Om detta är sant kommer nya fönster att använda manuell layout som standard."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid ""
 "Images over this size (in bytes) won't be thumbnailed. The purpose of this "
 "setting is to avoid thumbnailing large images that may take a long time to "
@@ -747,19 +890,19 @@ msgstr ""
 "för. Ändamålet med denna inställning är att undvika att skapa miniatyrbilder "
 "för stora bilder som tar lång tid att läsa in eller använder mycket minne."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 msgid "List of possible captions on icons"
 msgstr "Lista med möjliga rubriker på ikoner"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid "Maximum handled files in a folder"
 msgstr "Maximalt antal hanterade filer i en mapp"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid "Maximum image size for thumbnailing"
 msgstr "Maximal bildstorlek för skapande av miniatyrbilder"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
@@ -767,19 +910,19 @@ msgstr ""
 "Namnet på Nautilus-temat att använda. Denna inställningar har föråldrats "
 "sedan Nautilus 2.2. Använd ikontemat istället."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus hanterar ritandet av skrivbordet"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus använder användarens hemmapp som skrivbord"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Only show folders in the tree sidebar"
 msgstr "Visa endast mappar i trädsidopanelen"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
@@ -787,85 +930,83 @@ msgstr ""
 "Möjliga värden är \"single\" för att aktivera filer med enkelklick eller "
 "\"double\" för att aktivera dem med dubbelklicka."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
 msgid "Put labels beside icons"
 msgstr "Placera etiketter bredvid ikoner"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
 msgid "Reverse sort order in new windows"
 msgstr "Omvänd sorteringsordning i nya fönster"
 
-#. Translators: please note this can choose the size. e.g.
-#. "Sans 15". Please do not change "Sans", only change the size if you need to. In
-#. most cases, this should be left alone.
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#. Translators: please note this can choose the default font and the size. e.g. "Monospace 8". Please do not translate "Sans". In most cases, this should be left alone.
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 msgid "Sans 10"
 msgstr "Sans 10"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid "Show folders first in windows"
 msgstr "Visa mappar först i fönster"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid "Show location bar in new windows"
 msgstr "Visa adressrad i nya fönster"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid "Show mounted volumes on the desktop"
 msgstr "Visa monterade volymer på skrivbordet"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid "Show side pane in new windows"
 msgstr "Visa sidopanel i nya fönster"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "Show status bar in new windows"
 msgstr "Visa statusrad i nya fönster"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "Show toolbar in new windows"
 msgstr "Visa verktygsrad i nya fönster"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid "Side pane view"
 msgstr "Sidopanelsvy"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
 "Speed tradeoff for when to preview a sound file when mousing over a files "
 "icon. If set to \"always\" then always plays the sound, even if the file is "
 "on a remote server. If set to \"local_only\" then only plays previews on "
-"local file systems. If set to \"never\" then it never previews sound."
+"local filesystems. If set to \"never\" then it never previews sound."
 msgstr ""
-"Hastighetskompromiss för när en ljudfil ska förhandsvisas då muspekaren rör "
-"sig över en filikon. Om detta är satt till \"always\" kommer ljudet alltid "
-"att spelas, även om filen är på en fjärrserver. Om detta är satt till "
+"Hastighetskompromiss för när en ljudfil ska förhandsvisas då muspekaren "
+"vilar över ikonen. Om detta är satt till \"always\" kommer ljudet alltid att "
+"spelas, även om filen är på en fjärrserver. Om detta är satt till "
 "\"local_only\" kommer endast förhandsvisningar att spelas på lokala "
 "filsystem. Om detta är satt till \"never\" kommer förhandsvisningar aldrig "
 "att spelas."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid ""
 "Speed tradeoff for when to show a preview of text file contents in the "
 "file's icon. If set to \"always\" then always show previews, even if the "
 "folder is on a remote server. If set to \"local_only\" then only show "
-"previews for local file systems. If set to \"never\" then never bother to "
+"previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
-"Hastighetskompromiss för när en förhandsvisning av innehållet i en textfil "
-"ska visas i filens ikon. Om detta är satt till \"always\" kommer "
-"förhandsvisningar alltid att visas, även om mappen är på en fjärrserver. Om "
-"detta är satt till \"local_only\" kommer endast förhandsvisningar att visas "
-"för lokala filsystem. Om detta är satt till \"never\" kommer "
-"förhandsvisningsdata aldrig att läsas in."
-
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
+"Hastighetskompromiss för när en förhandsvisning av en textfil ska visas i "
+"filens ikon. Om detta är satt till \"always\" kommer förhandsvisningar "
+"alltid att visas, även om mappen är på en fjärrserver. Om detta är satt till "
+"\"local_only\" kommer endast förhandsvisningar att visas för lokala "
+"filsystem. Om detta är satt till \"never\" kommer förhandsvisningsdata "
+"aldrig att läsas in."
+
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
 "\"always\" then always thumbnail, even if the folder is on a remote server. "
-"If set to \"local_only\" then only show thumbnails for local file systems. "
-"If set to \"never\" then never bother to thumbnail images, just use a "
-"generic icon."
+"If set to \"local_only\" then only show thumbnails for local filesystems. If "
+"set to \"never\" then never bother to thumbnail images, just use a generic "
+"icon."
 msgstr ""
 "Hastighetskompromiss för när en bildfil ska visas som en miniatyrbild. Om "
 "detta är satt till \"always\" kommer en miniatyrbild alltid att skapas, även "
@@ -874,12 +1015,12 @@ msgstr ""
 "\"never\" kommer miniatyrbilder aldrig att skapas utan endast en allmän ikon "
 "att användas."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
 msgid ""
 "Speed tradeoff for when to show the number of items in a folder. If set to "
 "\"always\" then always show item counts, even if the folder is on a remote "
-"server. If set to \"local_only\" then only show counts for local file "
-"systems. If set to \"never\" then never bother to compute item counts."
+"server. If set to \"local_only\" then only show counts for local "
+"filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Hastighetskompromiss för när antalet objekt ska visas i en mapp. Om detta är "
 "satt till \"always\" kommer objektantal alltid att visas, även om mappen är "
@@ -887,7 +1028,7 @@ msgstr ""
 "att visas för lokala filsystem. Om detta är satt till \"never\" kommer "
 "objektantal aldrig att beräknas."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
@@ -895,7 +1036,7 @@ msgstr ""
 "Standardsorteringsordningen för objekt i ikonvyn. Möjliga värden är \"name"
 "\", \"size\", \"type\", \"modification_date\" och \"emblems\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
 msgid ""
 "The default sort-order for the items in the list view. Possible values are "
 "\"name\", \"size\", \"type\", and \"modification_date\"."
@@ -903,26 +1044,26 @@ msgstr ""
 "Standardsorteringsordningen för objekten i listvyn. Möjliga värden är \"name"
 "\", \"size\", \"type\" och \"modification_date\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 msgid "The default width of the side pane in new windows."
 msgstr "Standardbredden på sidopanelen i nya fönster."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "The font description used for the icons on the desktop."
 msgstr "Typsnittsbeskrivningen som används för ikonerna på skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
 msgstr ""
 "Formatet på fildatum. Möjliga värden är \"locale\", \"iso\" och \"informal\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid "The side pane view to show in newly opened windows."
 msgstr "Sidopanelsvyn att visa i nyöppnade fönster."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 msgid ""
 "This name can be set if you want a custom name for the computer icon on the "
 "desktop."
@@ -930,7 +1071,7 @@ msgstr ""
 "Detta namn kan ställas in om du vill ha ett anpassat namn på datorikonen på "
 "skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
@@ -938,7 +1079,7 @@ msgstr ""
 "Detta namn kan ställas in om du vill ha ett anpassat namn på hemikonen på "
 "skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
@@ -946,27 +1087,27 @@ msgstr ""
 "Detta namn kan ställas in om du vill ha ett anpassat namn på "
 "papperskorgsikonen på skrivbordet."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 msgid "Trash icon visible on desktop"
 msgstr "Papperskorgsikon synlig på skrivbordet"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Type of click used to launch/open files"
 msgstr "Typ av klick som används för att aktivera/öppna filer"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Use manual layout in new windows"
 msgstr "Använd manuell layout i nya fönster"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid "Use tighter layout in new windows"
 msgstr "Använd kompaktare layout i nya fönster"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
 msgid "What to do with executable text files when activated"
 msgstr "Vad som ska göras med körbara textfiler när de aktiveras"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
 msgid ""
 "What to do with executable text files when they are activated (single or "
 "double clicked). Possible values are \"launch\" to launch them as programs, "
@@ -978,7 +1119,7 @@ msgstr ""
 "program, \"ask\" för att fråga vad som ska göras via ett dialogfönster och "
 "\"display\" för att visa dem som textfiler."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
 msgid ""
 "When a folder is visited this viewer is used unless you have selected "
 "another view for that particular folder. Possible values are \"list_view\" "
@@ -987,262 +1128,259 @@ msgstr ""
 "När en mapp besöks används denna visare såvida du inte har valt en annan vy "
 "för denna mapp. Möjliga värden är \"list_view\" och \"icon_view\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
 msgid "When to show number of items in a folder"
 msgstr "När antalet antalet objekt i en mapp ska visas"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:101
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:99
 msgid "When to show preview text in icons"
 msgstr "När förhandsvisningstext i ikoner ska visas"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:102
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
 msgid "When to show thumbnails of image files"
 msgstr "När miniatyrbilder för bildfiler ska visas"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:103
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:101
 msgid "Whether a custom default folder background has been set."
 msgstr "Huruvida en standardmappbakgrund har ställts in."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:102
 msgid "Whether a custom default side pane background has been set."
 msgstr "Huruvida en standardsidopanelsbakgrund har ställts in."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:105
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:103
 msgid "Whether to ask for confirmation when moving files to trash"
 msgstr ""
 "Huruvida det ska frågas efter bekräftelse när filer flyttas till "
 "papperskorgen"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
 msgid "Whether to enable immediate deletion"
 msgstr "Huruvida omedelbar borttagning ska aktiveras"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:105
 msgid "Whether to preview sounds when mousing over an icon"
 msgstr "Huruvida ljud ska förhandsvisas då muspekaren vilar över en ikon"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:106
 msgid "Whether to show backup files"
 msgstr "Huruvida säkerhetskopior ska visas"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
 msgid "Whether to show hidden files"
 msgstr "Huruvida dolda filer ska visas"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
 msgid "Width of the side pane"
 msgstr "Bredd på sidopanelen"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:386
+msgid "Cut _Text"
+msgstr "Klipp _ut text"
+
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:442
+#: libnautilus-private/nautilus-clipboard.c:387
 msgid "Cut the selected text to the clipboard"
 msgstr "Klipp ut den markerade texten till urklipp"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:390
+msgid "_Copy Text"
+msgstr "K_opiera text"
+
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:446
+#: libnautilus-private/nautilus-clipboard.c:391
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopiera den markerade texten till urklipp"
 
 #. name, stock id
+#: libnautilus-private/nautilus-clipboard.c:394
+msgid "_Paste Text"
+msgstr "K_listra in text"
+
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:450
+#: libnautilus-private/nautilus-clipboard.c:395
 msgid "Paste the text stored on the clipboard"
 msgstr "Klistra in texten som är sparad i urklipp"
 
 #. name, stock id
-#: ../libnautilus-private/nautilus-clipboard.c:453
-#: ../src/file-manager/fm-directory-view.c:6176
+#: libnautilus-private/nautilus-clipboard.c:398
 msgid "Select _All"
 msgstr "Markera _allt"
 
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:454
+#: libnautilus-private/nautilus-clipboard.c:399
 msgid "Select all the text in a text field"
 msgstr "Markera all text i ett textfält"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:394
+#: libnautilus-private/nautilus-column-chooser.c:394
 msgid "Move _Up"
 msgstr "Flytta _upp"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:404
-msgid "Move Dow_n"
+#: libnautilus-private/nautilus-column-chooser.c:404
+msgid "Move _Down"
 msgstr "Flytta _ned"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:413
+#: libnautilus-private/nautilus-column-chooser.c:413
 msgid "_Show"
 msgstr "_Visa"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:423
-msgid "Hi_de"
-msgstr "D_ölj"
+#: libnautilus-private/nautilus-column-chooser.c:423
+msgid "_Hide"
+msgstr "_Dölj"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:436
-msgid "Use De_fault"
-msgstr "Använd _standard"
-
-#: ../libnautilus-private/nautilus-column-utilities.c:43
-#: ../src/file-manager/fm-list-view.c:1421
-msgid "Name"
-msgstr "Namn"
+#: libnautilus-private/nautilus-column-chooser.c:436
+msgid "_Use Default"
+msgstr "_Använd standard"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:44
+#: libnautilus-private/nautilus-column-utilities.c:44
 msgid "The name and icon of the file."
 msgstr "Namnet på filen och ikonen för den."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:50
+#: libnautilus-private/nautilus-column-utilities.c:50
 msgid "Size"
 msgstr "Storlek"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:51
+#: libnautilus-private/nautilus-column-utilities.c:51
 msgid "The size of the file."
 msgstr "Storleken på filen."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:58
-msgid "Type"
-msgstr "Typ"
-
-#: ../libnautilus-private/nautilus-column-utilities.c:59
+#: libnautilus-private/nautilus-column-utilities.c:59
 msgid "The type of the file."
 msgstr "Typen av fil."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:65
+#: libnautilus-private/nautilus-column-utilities.c:65
 msgid "Date Modified"
 msgstr "Ändringsdatum"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:66
+#: libnautilus-private/nautilus-column-utilities.c:66
 msgid "The date the file was modified."
 msgstr "Datumet då filen ändrades."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:73
+#: libnautilus-private/nautilus-column-utilities.c:73
 msgid "Date Accessed"
 msgstr "Ã…tkomstdatum"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:74
+#: libnautilus-private/nautilus-column-utilities.c:74
 msgid "The date the file was accessed."
 msgstr "Datumet då filen senast användes."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:81
+#: libnautilus-private/nautilus-column-utilities.c:81
 msgid "Owner"
 msgstr "Ägare"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:82
+#: libnautilus-private/nautilus-column-utilities.c:82
 msgid "The owner of the file."
 msgstr "Filens ägare."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:89
+#: libnautilus-private/nautilus-column-utilities.c:89
 msgid "Group"
 msgstr "Grupp"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:90
+#: libnautilus-private/nautilus-column-utilities.c:90
 msgid "The group of the file."
 msgstr "Filens grupp."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:97
-#: ../src/file-manager/fm-properties-window.c:2992
+#: libnautilus-private/nautilus-column-utilities.c:97
+#: src/file-manager/fm-properties-window.c:2939
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:98
+#: libnautilus-private/nautilus-column-utilities.c:98
 msgid "The permissions of the file."
 msgstr "Rättigheterna för filen."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:105
+#: libnautilus-private/nautilus-column-utilities.c:105
 msgid "Octal Permissions"
 msgstr "Rättigheter på oktal form"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:106
+#: libnautilus-private/nautilus-column-utilities.c:106
 msgid "The permissions of the file, in octal notation."
 msgstr "Rättigheterna för filen med oktal notation."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:113
+#: libnautilus-private/nautilus-column-utilities.c:113
 msgid "MIME Type"
 msgstr "MIME-typ"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:114
+#: libnautilus-private/nautilus-column-utilities.c:114
 msgid "The mime type of the file."
 msgstr "Mime-typen för filen."
 
-#: ../libnautilus-private/nautilus-customization-data.c:404
-msgid "Reset"
-msgstr "Återställ"
+#: libnautilus-private/nautilus-customization-data.c:406
+msgid "reset"
+msgstr "återställ"
 
-#: ../libnautilus-private/nautilus-desktop-directory-file.c:442
-#: ../libnautilus-private/nautilus-desktop-icon-file.c:163
-#: ../libnautilus-private/nautilus-trash-file.c:690
+#: libnautilus-private/nautilus-desktop-directory-file.c:442
+#: libnautilus-private/nautilus-desktop-icon-file.c:163
+#: libnautilus-private/nautilus-trash-file.c:690
 msgid "on the desktop"
 msgstr "på skrivbordet"
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:114
-#, c-format
-msgid "You cannot move the volume \"%s\" to the trash."
-msgstr "Du kan inte flytta volymen \"%s\" till papperskorgen."
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Du kan inte ta bort en volymikon."
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:124
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"If you want to eject the volume, please use \"Eject\" in the popup menu of "
+"If you want to eject the volume, please use Eject in the right-click menu of "
 "the volume."
 msgstr ""
-"Om du vill mata ut volymen bör du använda \"Mata ut\" i högerklicksmenyn för "
+"Om du vill mata ut volymen bör du använda Mata ut i högerklicksmenyn för "
 "volymen."
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:133
-msgid ""
-"If you want to unmount the volume, please use \"Unmount Volume\" in the "
-"popup menu of the volume."
-msgstr ""
-"Om du vill avmontera volymen bör du använda \"Avmontera volym\" i "
-"högerklicksmenyn för volymen."
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
+msgstr "Kan inte ta bort volym"
 
-#: ../libnautilus-private/nautilus-dnd.c:640
+#: libnautilus-private/nautilus-dnd.c:631
 msgid "_Move here"
 msgstr "_Flytta hit"
 
-#: ../libnautilus-private/nautilus-dnd.c:645
+#: libnautilus-private/nautilus-dnd.c:636
 msgid "_Copy here"
 msgstr "_Kopiera hit"
 
-#: ../libnautilus-private/nautilus-dnd.c:650
+#: libnautilus-private/nautilus-dnd.c:641
 msgid "_Link here"
 msgstr "_Länka hit"
 
-#: ../libnautilus-private/nautilus-dnd.c:655
+#: libnautilus-private/nautilus-dnd.c:646
 msgid "Set as _Background"
 msgstr "Ställ in som _bakgrund"
 
-#: ../libnautilus-private/nautilus-dnd.c:664
-#: ../libnautilus-private/nautilus-dnd.c:719
+#: libnautilus-private/nautilus-dnd.c:655
+#: libnautilus-private/nautilus-dnd.c:710
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../libnautilus-private/nautilus-dnd.c:705
+#: libnautilus-private/nautilus-dnd.c:696
 msgid "Set as background for _all folders"
 msgstr "Ställ in som bakgrund för _alla mappar"
 
-#: ../libnautilus-private/nautilus-dnd.c:710
+#: libnautilus-private/nautilus-dnd.c:701
 msgid "Set as background for _this folder"
 msgstr "Ställ in som bakgrund för _denna mapp"
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:197
-#: ../libnautilus-private/nautilus-emblem-utils.c:202
-#: ../libnautilus-private/nautilus-emblem-utils.c:257
-#: ../libnautilus-private/nautilus-emblem-utils.c:275
+#: libnautilus-private/nautilus-emblem-utils.c:197
+#: libnautilus-private/nautilus-emblem-utils.c:202
+#: libnautilus-private/nautilus-emblem-utils.c:257
+#: libnautilus-private/nautilus-emblem-utils.c:274
 msgid "The emblem cannot be installed."
 msgstr "Emblemet kan inte installeras."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:198
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Tyvärr, du måste ange ett icke-tomt nyckelord för det nya emblemet."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:199
-#: ../libnautilus-private/nautilus-emblem-utils.c:204
-#: ../libnautilus-private/nautilus-emblem-utils.c:259
-#: ../libnautilus-private/nautilus-emblem-utils.c:277
+#: libnautilus-private/nautilus-emblem-utils.c:199
+#: libnautilus-private/nautilus-emblem-utils.c:204
+#: libnautilus-private/nautilus-emblem-utils.c:259
+#: libnautilus-private/nautilus-emblem-utils.c:276
 msgid "Couldn't Install Emblem"
 msgstr "Kunde inte installera emblem"
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:203
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1252,78 +1390,70 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: ../libnautilus-private/nautilus-emblem-utils.c:213
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
 msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "Tyvärr, det finns redan ett emblem med namnet \"%s\"."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:214
+#: libnautilus-private/nautilus-emblem-utils.c:214
 msgid "Please choose a different emblem name."
 msgstr "Välj ett annat namn på emblemet."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:215
+#: libnautilus-private/nautilus-emblem-utils.c:215
 msgid "Couldn't install emblem"
 msgstr "Kunde inte installera emblem"
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:258
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Tyvärr, kan inte spara anpassat emblem."
 
-#: ../libnautilus-private/nautilus-emblem-utils.c:276
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Tyvärr, kan inte spara anpassat emblemnamn."
 
-#: ../libnautilus-private/nautilus-file-operations-progress.c:169
-#, c-format
-msgid "%s %ld of %ld %s"
-msgstr "%s %ld av %ld %s"
-
-#: ../libnautilus-private/nautilus-file-operations-progress.c:448
+#: libnautilus-private/nautilus-file-operations-progress.c:408
 #, c-format
 msgid "(%d:%02d:%d Remaining)"
 msgstr "(%d.%02d.%d återstår)"
 
-#: ../libnautilus-private/nautilus-file-operations-progress.c:453
+#: libnautilus-private/nautilus-file-operations-progress.c:413
 #, c-format
 msgid "(%d:%02d Remaining)"
 msgstr "(%d.%02d återstår)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:362
-#: ../libnautilus-private/nautilus-file-operations.c:387
-#: ../libnautilus-private/nautilus-file-utilities.c:70
-#: ../src/nautilus-connect-server-dialog.c:287
+#: libnautilus-private/nautilus-file-operations-progress.c:526
 #, c-format
-msgid "%s on %s"
-msgstr "%s på %s"
+msgid "%ld of %ld"
+msgstr "%ld av %ld"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: ../libnautilus-private/nautilus-file-operations.c:371
+#: libnautilus-private/nautilus-file-operations.c:358
 msgid "From:"
 msgstr "Från:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: ../libnautilus-private/nautilus-file-operations.c:394
+#: libnautilus-private/nautilus-file-operations.c:373
 msgid "To:"
 msgstr "Till:"
 
-#: ../libnautilus-private/nautilus-file-operations.c:580
-#: ../libnautilus-private/nautilus-file-operations.c:628
-#: ../libnautilus-private/nautilus-file-operations.c:633
-#: ../libnautilus-private/nautilus-file-operations.c:643
+#: libnautilus-private/nautilus-file-operations.c:559
+#: libnautilus-private/nautilus-file-operations.c:607
+#: libnautilus-private/nautilus-file-operations.c:612
+#: libnautilus-private/nautilus-file-operations.c:622
 msgid "Error while moving."
 msgstr "Fel vid flyttning."
 
-#: ../libnautilus-private/nautilus-file-operations.c:581
+#: libnautilus-private/nautilus-file-operations.c:560
 #, c-format
 msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr "\"%s\" kan inte flyttas eftersom den är på en skrivskyddad disk."
 
-#: ../libnautilus-private/nautilus-file-operations.c:591
-#: ../libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:570
+#: libnautilus-private/nautilus-file-operations.c:576
 msgid "Error while deleting."
 msgstr "Fel vid borttagning."
 
-#: ../libnautilus-private/nautilus-file-operations.c:592
+#: libnautilus-private/nautilus-file-operations.c:571
 #, c-format
 msgid ""
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
@@ -1332,12 +1462,12 @@ 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-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:577
 #, c-format
 msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr "\"%s\" kan inte tas bort eftersom den är på en skrivskyddad disk."
 
-#: ../libnautilus-private/nautilus-file-operations.c:629
+#: libnautilus-private/nautilus-file-operations.c:608
 #, c-format
 msgid ""
 "\"%s\" cannot be moved because you do not have permissions to change it or "
@@ -1346,7 +1476,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-private/nautilus-file-operations.c:634
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
 "Cannot move \"%s\" because it or its parent folder are contained in the "
@@ -1354,7 +1484,7 @@ msgid ""
 msgstr ""
 "Kan inte flytta \"%s\" eftersom den eller dess föräldermapp finns i målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:644
+#: libnautilus-private/nautilus-file-operations.c:623
 #, c-format
 msgid ""
 "Cannot move \"%s\" to the trash because you do not have permissions to "
@@ -1363,148 +1493,148 @@ msgstr ""
 "Kan inte flytta \"%s\" till papperskorgen eftersom du inte har de nödvändiga "
 "rättigheterna för att ändra den eller dess föräldermapp."
 
-#: ../libnautilus-private/nautilus-file-operations.c:666
+#: libnautilus-private/nautilus-file-operations.c:645
 msgid "Error while copying."
 msgstr "Fel vid kopiering."
 
-#: ../libnautilus-private/nautilus-file-operations.c:667
+#: libnautilus-private/nautilus-file-operations.c:646
 #, c-format
 msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "\"%s\" kan inte kopieras eftersom du inte har de nödvändiga rättigheterna "
 "för att läsa den."
 
-#: ../libnautilus-private/nautilus-file-operations.c:687
-#: ../libnautilus-private/nautilus-file-operations.c:708
-#: ../libnautilus-private/nautilus-file-operations.c:712
+#: libnautilus-private/nautilus-file-operations.c:666
+#: libnautilus-private/nautilus-file-operations.c:687
+#: libnautilus-private/nautilus-file-operations.c:691
 #, c-format
 msgid "Error while copying to \"%s\"."
 msgstr "Fel vid kopiering till \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:688
-#: ../libnautilus-private/nautilus-file-operations.c:693
-#: ../libnautilus-private/nautilus-file-operations.c:697
+#: libnautilus-private/nautilus-file-operations.c:667
+#: libnautilus-private/nautilus-file-operations.c:672
+#: libnautilus-private/nautilus-file-operations.c:676
 msgid "There is not enough space on the destination."
 msgstr "Det finns inte tillräckligt med utrymme på målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:692
+#: libnautilus-private/nautilus-file-operations.c:671
 #, c-format
 msgid "Error while moving to \"%s\"."
 msgstr "Fel vid flyttning till \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:696
+#: libnautilus-private/nautilus-file-operations.c:675
 #, c-format
 msgid "Error while creating link in \"%s\"."
 msgstr "Fel vid skapande av länk i \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:709
-#: ../libnautilus-private/nautilus-file-operations.c:720
-#: ../libnautilus-private/nautilus-file-operations.c:731
+#: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:710
 msgid "You do not have permissions to write to this folder."
 msgstr "Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
 
-#: ../libnautilus-private/nautilus-file-operations.c:713
-#: ../libnautilus-private/nautilus-file-operations.c:724
-#: ../libnautilus-private/nautilus-file-operations.c:735
+#: libnautilus-private/nautilus-file-operations.c:692
+#: libnautilus-private/nautilus-file-operations.c:703
+#: libnautilus-private/nautilus-file-operations.c:714
 msgid "The destination disk is read-only."
 msgstr "Målet är skrivskyddat."
 
-#: ../libnautilus-private/nautilus-file-operations.c:719
-#: ../libnautilus-private/nautilus-file-operations.c:723
+#: libnautilus-private/nautilus-file-operations.c:698
+#: libnautilus-private/nautilus-file-operations.c:702
 #, c-format
 msgid "Error while moving items to \"%s\"."
 msgstr "Fel vid flyttning av objekt till \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:730
-#: ../libnautilus-private/nautilus-file-operations.c:734
+#: libnautilus-private/nautilus-file-operations.c:709
+#: libnautilus-private/nautilus-file-operations.c:713
 #, c-format
 msgid "Error while creating links in \"%s\"."
 msgstr "Fel vid skapande av länkar i \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:762
+#: libnautilus-private/nautilus-file-operations.c:741
 #, c-format
 msgid "Error \"%s\" while copying \"%s\"."
 msgstr "Fel \"%s\" vid kopiering av \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:763
-#: ../libnautilus-private/nautilus-file-operations.c:767
-#: ../libnautilus-private/nautilus-file-operations.c:771
-#: ../libnautilus-private/nautilus-file-operations.c:777
-#: ../libnautilus-private/nautilus-file-operations.c:792
-#: ../libnautilus-private/nautilus-file-operations.c:796
-#: ../libnautilus-private/nautilus-file-operations.c:800
-#: ../libnautilus-private/nautilus-file-operations.c:806
+#: libnautilus-private/nautilus-file-operations.c:742
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:750
+#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:771
+#: libnautilus-private/nautilus-file-operations.c:775
+#: libnautilus-private/nautilus-file-operations.c:779
+#: libnautilus-private/nautilus-file-operations.c:785
 msgid "Would you like to continue?"
 msgstr "Vill du fortsätta?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:766
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
 msgid "Error \"%s\" while moving \"%s\"."
 msgstr "Fel \"%s\" vid flyttning av \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:749
 #, c-format
 msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr "Fel \"%s\" vid skapande av en länk till \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:776
+#: libnautilus-private/nautilus-file-operations.c:755
 #, c-format
 msgid "Error \"%s\" while deleting \"%s\"."
 msgstr "Fel \"%s\" vid borttagning av \"%s\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:791
+#: libnautilus-private/nautilus-file-operations.c:770
 #, c-format
 msgid "Error \"%s\" while copying."
 msgstr "Fel \"%s\" vid kopiering."
 
-#: ../libnautilus-private/nautilus-file-operations.c:795
+#: libnautilus-private/nautilus-file-operations.c:774
 #, c-format
 msgid "Error \"%s\" while moving."
 msgstr "Fel \"%s\" vid flyttning."
 
-#: ../libnautilus-private/nautilus-file-operations.c:799
+#: libnautilus-private/nautilus-file-operations.c:778
 #, c-format
 msgid "Error \"%s\" while linking."
 msgstr "Fel \"%s\" vid länkning."
 
-#: ../libnautilus-private/nautilus-file-operations.c:805
+#: libnautilus-private/nautilus-file-operations.c:784
 #, c-format
 msgid "Error \"%s\" while deleting."
 msgstr "Fel \"%s\" vid borttagning."
 
-#: ../libnautilus-private/nautilus-file-operations.c:931
+#: libnautilus-private/nautilus-file-operations.c:910
 msgid "Error While Copying"
 msgstr "Fel vid kopiering"
 
-#: ../libnautilus-private/nautilus-file-operations.c:934
+#: libnautilus-private/nautilus-file-operations.c:913
 msgid "Error While Moving"
 msgstr "Fel vid flyttning"
 
-#: ../libnautilus-private/nautilus-file-operations.c:937
+#: libnautilus-private/nautilus-file-operations.c:916
 msgid "Error While Linking"
 msgstr "Fel vid länkning"
 
-#: ../libnautilus-private/nautilus-file-operations.c:942
+#: libnautilus-private/nautilus-file-operations.c:921
 msgid "Error While Deleting"
 msgstr "Fel vid borttagning"
 
-#: ../libnautilus-private/nautilus-file-operations.c:961
-#: ../libnautilus-private/nautilus-file-operations.c:979
-msgid "_Retry"
-msgstr "_Försök igen"
-
-#: ../libnautilus-private/nautilus-file-operations.c:979
-#: ../libnautilus-private/nautilus-file-operations.c:1128
-#: ../libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:948
+#: libnautilus-private/nautilus-file-operations.c:969
+#: libnautilus-private/nautilus-file-operations.c:1118
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "_Skip"
 msgstr "_Hoppa över"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:969
+msgid "_Retry"
+msgstr "_Försök igen"
+
+#: libnautilus-private/nautilus-file-operations.c:1059
 #, c-format
 msgid "Could not move \"%s\" to the new location."
 msgstr "Kunde inte flytta \"%s\" till den nya platsen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1072
+#: libnautilus-private/nautilus-file-operations.c:1062
 msgid ""
 "The name is already used for a special item that cannot be removed or "
 "replaced.  If you still want to move the item, rename it and try again."
@@ -1513,12 +1643,12 @@ msgstr ""
 "ersättas. Om du fortfarande vill flytta objektet bör du byta namn på det och "
 "försöka igen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1076
+#: libnautilus-private/nautilus-file-operations.c:1066
 #, c-format
 msgid "Could not copy \"%s\" to the new location."
 msgstr "Kunde inte kopiera \"%s\" till den nya platsen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1079
+#: libnautilus-private/nautilus-file-operations.c:1069
 msgid ""
 "The name is already used for a special item that cannot be removed or "
 "replaced.  If you still want to copy the item, rename it and try again."
@@ -1527,21 +1657,21 @@ msgstr ""
 "ersättas. Om du fortfarande vill kopiera objektet bör du byta namn på det "
 "och försöka igen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1085
+#: libnautilus-private/nautilus-file-operations.c:1075
 msgid "Unable to Replace File"
 msgstr "Kan inte ersätta fil"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1101
+#: libnautilus-private/nautilus-file-operations.c:1091
 #, c-format
 msgid "The folder \"%s\" already exists.  Would you like to replace it?"
 msgstr "Mappen \"%s\" finns redan. Vill du ersätta den?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1104
+#: libnautilus-private/nautilus-file-operations.c:1094
 #, c-format
 msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr "Filen \"%s\" finns redan. Vill du ersätta den?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1112
+#: libnautilus-private/nautilus-file-operations.c:1102
 msgid ""
 "If you replace the existing folder, any files in it that conflict with the "
 "files being copied will be overwritten."
@@ -1549,21 +1679,21 @@ msgstr ""
 "Om du ersätter den befintliga mappen kommer alla filer i den som är i "
 "konflikt med de filer som kopieras att skrivas över."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1114
+#: libnautilus-private/nautilus-file-operations.c:1104
 msgid "If you replace an existing file, its contents will be overwritten."
 msgstr "Om du ersätter en befintlig fil kommer dess innehåll att skrivas över."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1127
-#: ../libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file-operations.c:1117
+#: libnautilus-private/nautilus-file-operations.c:1136
 msgid "Conflict While Copying"
 msgstr "Konflikt vid kopiering"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1128
-#: ../libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:1118
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1147
+#: libnautilus-private/nautilus-file-operations.c:1137
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
@@ -1572,15 +1702,15 @@ msgstr "Ersätt _alla"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:1205
-#: ../libnautilus-private/nautilus-file.c:4728
-#: ../src/file-manager/fm-directory-view.c:8479
+#: libnautilus-private/nautilus-file-operations.c:1195
+#: libnautilus-private/nautilus-file.c:4754
+#: src/file-manager/fm-directory-view.c:7912
 #, c-format
 msgid "link to %s"
 msgstr "länk till %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:1209
+#: libnautilus-private/nautilus-file-operations.c:1199
 #, c-format
 msgid "another link to %s"
 msgstr "ytterligare en länk till %s"
@@ -1589,25 +1719,25 @@ msgstr "ytterligare en länk till %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:1225
+#: libnautilus-private/nautilus-file-operations.c:1215
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d:a länken till %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:1229
+#: libnautilus-private/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d:a länken till %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:1233
+#: libnautilus-private/nautilus-file-operations.c:1223
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d:e länken till %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1227
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d:e länken till %s"
@@ -1617,12 +1747,12 @@ 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-private/nautilus-file-operations.c:1258
+#: libnautilus-private/nautilus-file-operations.c:1248
 msgid " (copy)"
 msgstr " (kopia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1260
+#: libnautilus-private/nautilus-file-operations.c:1250
 msgid " (another copy)"
 msgstr " (ytterligare en kopia)"
 
@@ -1630,36 +1760,36 @@ msgstr " (ytterligare en kopia)"
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1263
-#: ../libnautilus-private/nautilus-file-operations.c:1265
-#: ../libnautilus-private/nautilus-file-operations.c:1267
-#: ../libnautilus-private/nautilus-file-operations.c:1277
+#: libnautilus-private/nautilus-file-operations.c:1253
+#: libnautilus-private/nautilus-file-operations.c:1255
+#: libnautilus-private/nautilus-file-operations.c:1257
+#: libnautilus-private/nautilus-file-operations.c:1267
 msgid "th copy)"
 msgstr ":e kopian)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1270
+#: libnautilus-private/nautilus-file-operations.c:1260
 msgid "st copy)"
 msgstr ":a kopian)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1272
+#: libnautilus-private/nautilus-file-operations.c:1262
 msgid "nd copy)"
 msgstr ":a kopian)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:1274
+#: libnautilus-private/nautilus-file-operations.c:1264
 msgid "rd copy)"
 msgstr ":e kopian)"
 
 #. localizers: appended to first file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1291
+#: libnautilus-private/nautilus-file-operations.c:1281
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopia)%s"
 
 #. localizers: appended to second file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1293
+#: libnautilus-private/nautilus-file-operations.c:1283
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ytterligare en kopia)%s"
@@ -1668,276 +1798,276 @@ msgstr "%s (ytterligare en kopia)%s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1296
-#: ../libnautilus-private/nautilus-file-operations.c:1298
-#: ../libnautilus-private/nautilus-file-operations.c:1300
-#: ../libnautilus-private/nautilus-file-operations.c:1309
+#: libnautilus-private/nautilus-file-operations.c:1286
+#: libnautilus-private/nautilus-file-operations.c:1288
+#: libnautilus-private/nautilus-file-operations.c:1290
+#: libnautilus-private/nautilus-file-operations.c:1299
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d:e kopian)%s"
 
 #. localizers: appended to x1st file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1303
+#: libnautilus-private/nautilus-file-operations.c:1293
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d:a kopian)%s"
 
 #. localizers: appended to x2nd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1305
+#: libnautilus-private/nautilus-file-operations.c:1295
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d:a kopian)%s"
 
 #. localizers: appended to x3rd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:1307
+#: libnautilus-private/nautilus-file-operations.c:1297
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d:e kopian)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:1407
+#: libnautilus-private/nautilus-file-operations.c:1397
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:1415
+#: libnautilus-private/nautilus-file-operations.c:1405
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1611
-#: ../libnautilus-private/nautilus-file-operations.c:2211
-#: ../libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:1601
+#: libnautilus-private/nautilus-file-operations.c:2194
+#: libnautilus-private/nautilus-file-operations.c:2356
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Okänd GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:1948
+#: libnautilus-private/nautilus-file-operations.c:1931
 msgid "Moving files to the Trash"
 msgstr "Flyttar filer till papperskorgen"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:1950
+#: libnautilus-private/nautilus-file-operations.c:1933
 msgid "Throwing out file:"
 msgstr "Kastar fil:"
 
 #. localizers: label prepended to the name of the current file moved
-#: ../libnautilus-private/nautilus-file-operations.c:1952
-#: ../libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1946
 msgid "Moving"
 msgstr "Flyttar"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1953
+#: libnautilus-private/nautilus-file-operations.c:1936
 msgid "Preparing to Move to Trash..."
 msgstr "Förbereder flyttning till papperskorgen..."
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:1959
+#: libnautilus-private/nautilus-file-operations.c:1942
 msgid "Moving files"
 msgstr "Flyttar filer"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:1961
+#: libnautilus-private/nautilus-file-operations.c:1944
 msgid "Moving file:"
 msgstr "Flyttar fil:"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1964
+#: libnautilus-private/nautilus-file-operations.c:1947
 msgid "Preparing To Move..."
 msgstr "Förbereder flyttning..."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1948
 msgid "Finishing Move..."
 msgstr "Slutför flyttning..."
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:1973
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Creating links to files"
 msgstr "Skapar länkar till filer"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:1975
+#: libnautilus-private/nautilus-file-operations.c:1958
 msgid "Linking file:"
 msgstr "Länkar fil:"
 
 #. localizers: label prepended to the name of the current file linked
-#: ../libnautilus-private/nautilus-file-operations.c:1977
+#: libnautilus-private/nautilus-file-operations.c:1960
 msgid "Linking"
 msgstr "Länkar"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1961
 msgid "Preparing to Create Links..."
 msgstr "Förbereder skapande av länkar..."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:1962
 msgid "Finishing Creating Links..."
 msgstr "Slutför skapande av länkar..."
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:1985
+#: libnautilus-private/nautilus-file-operations.c:1968
 msgid "Copying files"
 msgstr "Kopierar filer"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:1987
+#: libnautilus-private/nautilus-file-operations.c:1970
 msgid "Copying file:"
 msgstr "Kopierar fil:"
 
 #. localizers: label prepended to the name of the current file copied
-#: ../libnautilus-private/nautilus-file-operations.c:1989
+#: libnautilus-private/nautilus-file-operations.c:1972
 msgid "Copying"
 msgstr "Kopierar"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1990
+#: libnautilus-private/nautilus-file-operations.c:1973
 msgid "Preparing To Copy..."
 msgstr "Förbereder kopiering..."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2008
+#: libnautilus-private/nautilus-file-operations.c:1991
 msgid "You cannot copy items into the trash."
 msgstr "Du kan inte kopiera objekt till papperskorgen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2009
+#: libnautilus-private/nautilus-file-operations.c:1992
 msgid "You cannot create links inside the trash."
 msgstr "Du kan inte skapa länkar inuti papperskorgen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2010
+#: libnautilus-private/nautilus-file-operations.c:1993
 msgid "Files and folders can only be moved into the trash."
 msgstr "Endast filer och mappar kan flyttas till papperskorgen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2034
+#: libnautilus-private/nautilus-file-operations.c:2017
 msgid "You cannot move this trash folder."
 msgstr "Du kan inte flytta denna papperskorgsmapp."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2035
+#: libnautilus-private/nautilus-file-operations.c:2018
 msgid "You cannot copy this trash folder."
 msgstr "Du kan inte kopiera denna papperskorgsmapp."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2036
+#: libnautilus-private/nautilus-file-operations.c:2019
 msgid "A trash folder is used for storing items moved to the trash."
 msgstr ""
 "En papperskorgsmapp används för lagring av objekt som flyttats till "
 "papperskorgen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2038
+#: libnautilus-private/nautilus-file-operations.c:2021
 msgid "Can't Change Trash Location"
 msgstr "Kan inte byta plats på papperskorgen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2039
+#: libnautilus-private/nautilus-file-operations.c:2022
 msgid "Can't Copy Trash"
 msgstr "Kan inte kopiera papperskorgen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2063
+#: libnautilus-private/nautilus-file-operations.c:2046
 msgid "You cannot move a folder into itself."
 msgstr "Du kan inte flytta en mapp in i sig själv."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2064
+#: libnautilus-private/nautilus-file-operations.c:2047
 msgid "You cannot copy a folder into itself."
 msgstr "Du kan inte kopiera en mapp in i sig själv."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2065
+#: libnautilus-private/nautilus-file-operations.c:2048
 msgid "The destination folder is inside the source folder."
 msgstr "Målmappen är inuti källmappen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2067
+#: libnautilus-private/nautilus-file-operations.c:2050
 msgid "Can't Move Into Self"
 msgstr "Kan inte flytta in i sig själv"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2068
+#: libnautilus-private/nautilus-file-operations.c:2051
 msgid "Can't Copy Into Self"
 msgstr "Kan inte kopiera in i sig själv"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2081
+#: libnautilus-private/nautilus-file-operations.c:2064
 msgid "You cannot copy a file over itself."
 msgstr "Du kan inte kopiera en fil över sig själv."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2082
+#: libnautilus-private/nautilus-file-operations.c:2065
 msgid "The destination and source are the same file."
 msgstr "Målet och källan är samma fil."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2083
+#: libnautilus-private/nautilus-file-operations.c:2066
 msgid "Can't Copy Over Self"
 msgstr "Kan inte kopiera över sig själv"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2135
-#: ../libnautilus-private/nautilus-file-operations.c:2274
+#: libnautilus-private/nautilus-file-operations.c:2118
+#: libnautilus-private/nautilus-file-operations.c:2258
 msgid "You do not have permissions to write to the destination."
 msgstr "Du har inte de nödvändiga rättigheterna för att skriva till målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2137
-#: ../libnautilus-private/nautilus-file-operations.c:2276
+#: libnautilus-private/nautilus-file-operations.c:2120
+#: libnautilus-private/nautilus-file-operations.c:2260
 msgid "There is no space on the destination."
 msgstr "Det finns inget utrymme på målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2139
+#: libnautilus-private/nautilus-file-operations.c:2122
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Fel \"%s\" vid skapande av ny mapp."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2144
+#: libnautilus-private/nautilus-file-operations.c:2127
 msgid "Error creating new folder."
 msgstr "Fel vid skapande av ny mapp."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2144
+#: libnautilus-private/nautilus-file-operations.c:2127
 msgid "Error Creating New Folder"
 msgstr "Fel vid skapande av ny mapp"
 
 #. localizers: the initial name of a new folder
-#: ../libnautilus-private/nautilus-file-operations.c:2239
+#: libnautilus-private/nautilus-file-operations.c:2222
 msgid "untitled folder"
 msgstr "namnlös mapp"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2278
+#: libnautilus-private/nautilus-file-operations.c:2262
 #, c-format
 msgid "Error \"%s\" creating new document."
 msgstr "Fel \"%s\" vid skapande av nytt dokument."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2283
+#: libnautilus-private/nautilus-file-operations.c:2267
 msgid "Error creating new document."
 msgstr "Fel vid skapande av nytt dokument."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2283
+#: libnautilus-private/nautilus-file-operations.c:2267
 msgid "Error Creating New Document"
 msgstr "Fel vid skapande av nytt dokument"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2505
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "new file"
 msgstr "ny fil"
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:2570
+#: libnautilus-private/nautilus-file-operations.c:2487
 msgid "Deleting files"
 msgstr "Tar bort filer"
 
 #. localizers: label prepended to the progress count
-#: ../libnautilus-private/nautilus-file-operations.c:2572
-#: ../libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2489
+#: libnautilus-private/nautilus-file-operations.c:2524
 msgid "Files deleted:"
 msgstr "Filer som tagits bort:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: ../libnautilus-private/nautilus-file-operations.c:2574
-#: ../libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2491
+#: libnautilus-private/nautilus-file-operations.c:2526
 msgid "Deleting"
 msgstr "Tar bort"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2575
+#: libnautilus-private/nautilus-file-operations.c:2492
 msgid "Preparing to Delete files..."
 msgstr "Förbereder borttagning av filer..."
 
 #. localizers: progress dialog title
-#: ../libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2522
 msgid "Emptying the Trash"
 msgstr "Tömmer papperskorgen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2527
 msgid "Preparing to Empty the Trash..."
 msgstr "Förbereder tömning av papperskorgen..."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2646
+#: libnautilus-private/nautilus-file-operations.c:2563
 msgid "Empty all of the items from the trash?"
 msgstr "Tömma alla objekt i papperskorgen?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2649
+#: libnautilus-private/nautilus-file-operations.c:2566
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
@@ -1946,40 +2076,42 @@ msgstr ""
 "permanent. Observera att du även kan ta bort dem separat."
 
 # T, Ö, M, P, A är alla redan upptagna snabbtangenter här
-#: ../libnautilus-private/nautilus-file-operations.c:2671
+#. name, stock id
+#: libnautilus-private/nautilus-file-operations.c:2588
+#: src/file-manager/fm-directory-view.c:5767
+#: src/file-manager/fm-directory-view.c:6314
 msgid "_Empty Trash"
 msgstr "Töm pappers_korgen"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:480
-#: ../libnautilus-private/nautilus-global-preferences.c:512
-#: ../nautilus-computer.desktop.in.h:1
+#: libnautilus-private/nautilus-file-utilities.c:442
+#: libnautilus-private/nautilus-global-preferences.c:534
+#: nautilus-computer.desktop.in.h:1
 msgid "Computer"
 msgstr "Dator"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:482
+#: libnautilus-private/nautilus-file-utilities.c:444
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:484
+#: libnautilus-private/nautilus-file-utilities.c:446
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:486
+#: libnautilus-private/nautilus-file-utilities.c:448
 msgid "Themes"
 msgstr "Teman"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:488
+#: libnautilus-private/nautilus-file-utilities.c:450
 msgid "CD/DVD Creator"
 msgstr "Cd/dvd-skapare"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:490
+#: libnautilus-private/nautilus-file-utilities.c:452
 msgid "Windows Network"
 msgstr "Windows-nätverk"
 
 # Konstigt, borde förklaras i en kommentar tycker man
 # http://bugzilla.gnome.org/show_bug.cgi?id=145305
-#. translators: this is the title of the "dns-sd:///" location
-#: ../libnautilus-private/nautilus-file-utilities.c:493
+#: libnautilus-private/nautilus-file-utilities.c:454
 msgid "Services in"
 msgstr "Tjänster i"
 
@@ -1998,65 +2130,65 @@ msgstr "Tjänster i"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: ../libnautilus-private/nautilus-file.c:2944
+#: libnautilus-private/nautilus-file.c:2970
 msgid "today at 00:00:00 PM"
 msgstr "idag klockan 00.00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2945
-#: ../src/nautilus-file-management-properties.c:493
+#: libnautilus-private/nautilus-file.c:2971
+#: src/nautilus-file-management-properties.c:493
 msgid "today at %-I:%M:%S %p"
 msgstr "idag klockan %H.%M.%S"
 
-#: ../libnautilus-private/nautilus-file.c:2947
+#: libnautilus-private/nautilus-file.c:2973
 msgid "today at 00:00 PM"
 msgstr "idag klockan 00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2948
+#: libnautilus-private/nautilus-file.c:2974
 msgid "today at %-I:%M %p"
 msgstr "idag klockan %H.%M"
 
-#: ../libnautilus-private/nautilus-file.c:2950
+#: libnautilus-private/nautilus-file.c:2976
 msgid "today, 00:00 PM"
 msgstr "idag, 00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2951
+#: libnautilus-private/nautilus-file.c:2977
 msgid "today, %-I:%M %p"
 msgstr "idag, %H.%M"
 
-#: ../libnautilus-private/nautilus-file.c:2953
-#: ../libnautilus-private/nautilus-file.c:2954
+#: libnautilus-private/nautilus-file.c:2979
+#: libnautilus-private/nautilus-file.c:2980
 msgid "today"
 msgstr "idag"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: ../libnautilus-private/nautilus-file.c:2963
+#: libnautilus-private/nautilus-file.c:2989
 msgid "yesterday at 00:00:00 PM"
 msgstr "igår klockan 00.00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2964
+#: libnautilus-private/nautilus-file.c:2990
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "igår klockan %H.%M.%S"
 
-#: ../libnautilus-private/nautilus-file.c:2966
+#: libnautilus-private/nautilus-file.c:2992
 msgid "yesterday at 00:00 PM"
 msgstr "igår klockan 00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2967
+#: libnautilus-private/nautilus-file.c:2993
 msgid "yesterday at %-I:%M %p"
 msgstr "igår klockan %H.%M"
 
-#: ../libnautilus-private/nautilus-file.c:2969
+#: libnautilus-private/nautilus-file.c:2995
 msgid "yesterday, 00:00 PM"
 msgstr "igår, 00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2970
+#: libnautilus-private/nautilus-file.c:2996
 msgid "yesterday, %-I:%M %p"
 msgstr "igår, %H.%M"
 
-#: ../libnautilus-private/nautilus-file.c:2972
-#: ../libnautilus-private/nautilus-file.c:2973
+#: libnautilus-private/nautilus-file.c:2998
+#: libnautilus-private/nautilus-file.c:2999
 msgid "yesterday"
 msgstr "igår"
 
@@ -2065,78 +2197,78 @@ msgstr "igår"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: ../libnautilus-private/nautilus-file.c:2984
+#: libnautilus-private/nautilus-file.c:3010
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Torsdagen den 00 september 0000 kl. 00.00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2985
+#: libnautilus-private/nautilus-file.c:3011
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A %-d %B %Y kl. %H.%M.%S"
 
-#: ../libnautilus-private/nautilus-file.c:2987
+#: libnautilus-private/nautilus-file.c:3013
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "MÃ¥n 00 okt 0000 kl. 00.00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2988
+#: libnautilus-private/nautilus-file.c:3014
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d %b %Y kl. %H.%M.%S"
 
-#: ../libnautilus-private/nautilus-file.c:2990
+#: libnautilus-private/nautilus-file.c:3016
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "MÃ¥n 00 okt 0000 kl. 00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2991
+#: libnautilus-private/nautilus-file.c:3017
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d %b %Y kl. %H.%M"
 
-#: ../libnautilus-private/nautilus-file.c:2993
+#: libnautilus-private/nautilus-file.c:3019
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 okt 0000 kl. 00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2994
+#: libnautilus-private/nautilus-file.c:3020
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y kl. %H.%M"
 
-#: ../libnautilus-private/nautilus-file.c:2996
+#: libnautilus-private/nautilus-file.c:3022
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 okt 0000, 00.00"
 
-#: ../libnautilus-private/nautilus-file.c:2997
+#: libnautilus-private/nautilus-file.c:3023
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %H.%M"
 
-#: ../libnautilus-private/nautilus-file.c:2999
+#: libnautilus-private/nautilus-file.c:3025
 msgid "00/00/00, 00:00 PM"
 msgstr "0000-00-00, 00.00"
 
-#: ../libnautilus-private/nautilus-file.c:3000
+#: libnautilus-private/nautilus-file.c:3026
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%Y-%m-%d, %H.%M"
 
-#: ../libnautilus-private/nautilus-file.c:3002
+#: libnautilus-private/nautilus-file.c:3028
 msgid "00/00/00"
 msgstr "0000-00-00"
 
-#: ../libnautilus-private/nautilus-file.c:3003
+#: libnautilus-private/nautilus-file.c:3029
 msgid "%m/%d/%y"
 msgstr "%Y-%m-%d"
 
-#: ../libnautilus-private/nautilus-file.c:4294
-#: ../src/file-manager/fm-directory-view.c:1933
+#: libnautilus-private/nautilus-file.c:4320
+#: src/file-manager/fm-directory-view.c:1859
 #, c-format
 msgid "%u item"
 msgid_plural "%u items"
 msgstr[0] "%u objekt"
 msgstr[1] "%u objekt"
 
-#: ../libnautilus-private/nautilus-file.c:4295
+#: libnautilus-private/nautilus-file.c:4321
 #, c-format
 msgid "%u folder"
 msgid_plural "%u folders"
 msgstr[0] "%u mapp"
 msgstr[1] "%u mappar"
 
-#: ../libnautilus-private/nautilus-file.c:4296
+#: libnautilus-private/nautilus-file.c:4322
 #, c-format
 msgid "%u file"
 msgid_plural "%u files"
@@ -2144,37 +2276,37 @@ msgstr[0] "%u fil"
 msgstr[1] "%u filer"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:4621
-#: ../libnautilus-private/nautilus-file.c:4637
+#: libnautilus-private/nautilus-file.c:4647
+#: libnautilus-private/nautilus-file.c:4663
 msgid "? items"
 msgstr "? objekt"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:4627
+#: libnautilus-private/nautilus-file.c:4653
 msgid "? bytes"
 msgstr "? byte"
 
-#: ../libnautilus-private/nautilus-file.c:4642
+#: libnautilus-private/nautilus-file.c:4668
 msgid "unknown type"
 msgstr "okänd typ"
 
-#: ../libnautilus-private/nautilus-file.c:4645
+#: libnautilus-private/nautilus-file.c:4671
 msgid "unknown MIME type"
 msgstr "okänd MIME-typ"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: ../libnautilus-private/nautilus-file.c:4651
-#: ../src/file-manager/fm-properties-window.c:1306
+#: libnautilus-private/nautilus-file.c:4677
+#: src/file-manager/fm-properties-window.c:1220
 msgid "unknown"
 msgstr "okänd"
 
-#: ../libnautilus-private/nautilus-file.c:4684
+#: libnautilus-private/nautilus-file.c:4710
 msgid "program"
 msgstr "program"
 
-#: ../libnautilus-private/nautilus-file.c:4702
+#: libnautilus-private/nautilus-file.c:4728
 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 "
@@ -2184,7 +2316,7 @@ msgstr ""
 "troligtvis att din gnome-vfs.keys-fil finns på fel plats eller inte kan "
 "hittas av någon annan anledning."
 
-#: ../libnautilus-private/nautilus-file.c:4706
+#: libnautilus-private/nautilus-file.c:4732
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -2193,210 +2325,210 @@ msgstr ""
 "Ingen beskrivning kunde hittas för mime-typen \"%s\" (filen är \"%s\"), tala "
 "om det för gnome-vfs-sändlistan (på engelska)."
 
-#: ../libnautilus-private/nautilus-file.c:4722
+#: libnautilus-private/nautilus-file.c:4748
 msgid "link"
 msgstr "länk"
 
-#: ../libnautilus-private/nautilus-file.c:4742
+#: libnautilus-private/nautilus-file.c:4768
 msgid "link (broken)"
 msgstr "länk (trasig)"
 
-#: ../libnautilus-private/nautilus-file.c:6170
-#: ../libnautilus-private/nautilus-global-preferences.c:518
-#: ../libnautilus-private/nautilus-trash-directory.c:353
+#: libnautilus-private/nautilus-file.c:6196
+#: libnautilus-private/nautilus-global-preferences.c:540
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:70
+#: libnautilus-private/nautilus-global-preferences.c:100
 msgid "_Always"
 msgstr "_Alltid"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:71
+#: libnautilus-private/nautilus-global-preferences.c:101
 msgid "_Local File Only"
 msgstr "_Endast lokala filer"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:72
+#: libnautilus-private/nautilus-global-preferences.c:102
 msgid "_Never"
 msgstr "Al_drig"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:78
-#: ../src/nautilus-file-management-properties.glade.h:14
+#: libnautilus-private/nautilus-global-preferences.c:108
+#: src/nautilus-file-management-properties.glade.h:14
 #, no-c-format
 msgid "25%"
 msgstr "25%"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:80
-#: ../src/nautilus-file-management-properties.glade.h:20
+#: libnautilus-private/nautilus-global-preferences.c:110
+#: src/nautilus-file-management-properties.glade.h:20
 #, no-c-format
 msgid "50%"
 msgstr "50%"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:82
-#: ../src/nautilus-file-management-properties.glade.h:23
+#: libnautilus-private/nautilus-global-preferences.c:112
+#: src/nautilus-file-management-properties.glade.h:23
 #, no-c-format
 msgid "75%"
 msgstr "75%"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:84
-#: ../src/nautilus-file-management-properties.glade.h:8
+#: libnautilus-private/nautilus-global-preferences.c:114
+#: src/nautilus-file-management-properties.glade.h:8
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:86
-#: ../src/nautilus-file-management-properties.glade.h:10
+#: libnautilus-private/nautilus-global-preferences.c:116
+#: src/nautilus-file-management-properties.glade.h:10
 #, no-c-format
 msgid "150%"
 msgstr "150%"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:88
-#: ../src/nautilus-file-management-properties.glade.h:12
+#: libnautilus-private/nautilus-global-preferences.c:118
+#: src/nautilus-file-management-properties.glade.h:12
 #, no-c-format
 msgid "200%"
 msgstr "200%"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:90
-#: ../src/nautilus-file-management-properties.glade.h:17
+#: libnautilus-private/nautilus-global-preferences.c:120
+#: src/nautilus-file-management-properties.glade.h:17
 #, no-c-format
 msgid "400%"
 msgstr "400%"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:95
+#: libnautilus-private/nautilus-global-preferences.c:125
 msgid "100 K"
 msgstr "100 kB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:96
+#: libnautilus-private/nautilus-global-preferences.c:126
 msgid "500 K"
 msgstr "500 kB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:97
-#: ../src/nautilus-file-management-properties.glade.h:3
+#: libnautilus-private/nautilus-global-preferences.c:127
+#: src/nautilus-file-management-properties.glade.h:3
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:98
-#: ../src/nautilus-file-management-properties.glade.h:15
+#: libnautilus-private/nautilus-global-preferences.c:128
+#: src/nautilus-file-management-properties.glade.h:15
 msgid "3 MB"
 msgstr "3 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:99
-#: ../src/nautilus-file-management-properties.glade.h:18
+#: libnautilus-private/nautilus-global-preferences.c:129
+#: src/nautilus-file-management-properties.glade.h:18
 msgid "5 MB"
 msgstr "5 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:100
-#: ../src/nautilus-file-management-properties.glade.h:4
+#: libnautilus-private/nautilus-global-preferences.c:130
+#: src/nautilus-file-management-properties.glade.h:4
 msgid "10 MB"
 msgstr "10 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:101
-#: ../src/nautilus-file-management-properties.glade.h:6
+#: libnautilus-private/nautilus-global-preferences.c:131
+#: src/nautilus-file-management-properties.glade.h:6
 msgid "100 MB"
 msgstr "100 MB"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:107
+#: libnautilus-private/nautilus-global-preferences.c:137
 msgid "Activate items with a _single click"
 msgstr "Aktivera objekt med ett _enkelklick"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:111
+#: libnautilus-private/nautilus-global-preferences.c:141
 msgid "Activate items with a _double click"
 msgstr "Aktivera objekt med ett _dubbelklick"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:119
+#: libnautilus-private/nautilus-global-preferences.c:149
 msgid "E_xecute files when they are clicked"
 msgstr "_Kör filer när de klickas"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:123
+#: libnautilus-private/nautilus-global-preferences.c:153
 msgid "Display _files when they are clicked"
 msgstr "_Visa filer när de klickas"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:127
-#: ../src/nautilus-file-management-properties.glade.h:70
+#: libnautilus-private/nautilus-global-preferences.c:157
+#: src/nautilus-file-management-properties.glade.h:70
 msgid "_Ask each time"
 msgstr "_Fråga varje gång"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:135
+#: libnautilus-private/nautilus-global-preferences.c:165
 msgid "Search for files by file name only"
 msgstr "Sök efter filer endast på filnamn"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:139
+#: libnautilus-private/nautilus-global-preferences.c:169
 msgid "Search for files by file name and file properties"
 msgstr "Sök efter filer på filnamn och på filegenskaper"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:146
-#: ../src/file-manager/fm-icon-container.c:500
-#: ../src/nautilus-file-management-properties.glade.h:54
+#: libnautilus-private/nautilus-global-preferences.c:176
+#: src/file-manager/fm-icon-container.c:500
+#: src/nautilus-file-management-properties.glade.h:54
 msgid "Icon View"
 msgstr "Ikonvy"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:147
-#: ../src/file-manager/fm-list-view.c:1475
-#: ../src/nautilus-file-management-properties.glade.h:56
+#: libnautilus-private/nautilus-global-preferences.c:177
+#: src/file-manager/fm-list-view.c:1166
+#: src/nautilus-file-management-properties.glade.h:56
 msgid "List View"
 msgstr "Listvy"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:152
+#: libnautilus-private/nautilus-global-preferences.c:182
 msgid "Manually"
 msgstr "Manuellt"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:154
-#: ../src/nautilus-file-management-properties.glade.h:44
+#: libnautilus-private/nautilus-global-preferences.c:184
+#: src/nautilus-file-management-properties.glade.h:44
 msgid "By Name"
 msgstr "Efter namn"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:155
-#: ../src/nautilus-file-management-properties.glade.h:45
+#: libnautilus-private/nautilus-global-preferences.c:185
+#: src/nautilus-file-management-properties.glade.h:45
 msgid "By Size"
 msgstr "Efter storlek"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:156
-#: ../src/nautilus-file-management-properties.glade.h:46
+#: libnautilus-private/nautilus-global-preferences.c:186
+#: src/nautilus-file-management-properties.glade.h:46
 msgid "By Type"
 msgstr "Efter typ"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:157
-#: ../src/nautilus-file-management-properties.glade.h:43
+#: libnautilus-private/nautilus-global-preferences.c:187
+#: src/nautilus-file-management-properties.glade.h:43
 msgid "By Modification Date"
 msgstr "Efter ändringsdatum"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:158
-#: ../src/nautilus-file-management-properties.glade.h:42
+#: libnautilus-private/nautilus-global-preferences.c:188
+#: src/nautilus-file-management-properties.glade.h:42
 msgid "By Emblems"
 msgstr "Efter emblem"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:163
+#: libnautilus-private/nautilus-global-preferences.c:193
 msgid "8"
 msgstr "8"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:164
+#: libnautilus-private/nautilus-global-preferences.c:194
 msgid "10"
 msgstr "10"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:165
+#: libnautilus-private/nautilus-global-preferences.c:195
 msgid "12"
 msgstr "12"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:166
+#: libnautilus-private/nautilus-global-preferences.c:196
 msgid "14"
 msgstr "14"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:167
+#: libnautilus-private/nautilus-global-preferences.c:197
 msgid "16"
 msgstr "16"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:168
+#: libnautilus-private/nautilus-global-preferences.c:198
 msgid "18"
 msgstr "18"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:169
+#: libnautilus-private/nautilus-global-preferences.c:199
 msgid "20"
 msgstr "20"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:170
+#: libnautilus-private/nautilus-global-preferences.c:200
 msgid "22"
 msgstr "22"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:171
+#: libnautilus-private/nautilus-global-preferences.c:201
 msgid "24"
 msgstr "24"
 
@@ -2408,36 +2540,153 @@ msgstr "24"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: ../libnautilus-private/nautilus-global-preferences.c:506
+#: libnautilus-private/nautilus-global-preferences.c:528
 #, c-format
 msgid "%s's Home"
 msgstr "%.0sHem"
 
-#: ../libnautilus-private/nautilus-icon-container.c:2119
+#: libnautilus-private/nautilus-icon-canvas-item.c:2892
+msgid "editable text"
+msgstr "redigerbar text"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2893
+msgid "the editable label"
+msgstr "den redigerbara etiketten"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2900
+msgid "additional text"
+msgstr "ytterligare text"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2901
+msgid "some more text"
+msgstr "mer text"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2908
+msgid "highlighted for selection"
+msgstr "färgmarkerad för markering"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2909
+msgid "whether we are highlighted for a selection"
+msgstr "huruvida vi är färgmarkerade för en markering"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2916
+msgid "highlighted as keyboard focus"
+msgstr "färgmarkerad som tangentbordsfokus"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2917
+msgid "whether we are highlighted to render keyboard focus"
+msgstr "huruvida vi är färgmarkerade för att rendera fokus"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2925
+msgid "highlighted for drop"
+msgstr "färgmarkerad för släpp"
+
+#: libnautilus-private/nautilus-icon-canvas-item.c:2926
+msgid "whether we are highlighted for a D&D drop"
+msgstr "huruvida vi är färgmarkerade för ett drag-och-släpp"
+
+#: libnautilus-private/nautilus-icon-container.c:2107
 msgid "The selection rectangle"
 msgstr "Markeringsrektangeln"
 
-#: ../libnautilus-private/nautilus-icon-container.c:4323
-msgid "Normal Alpha"
-msgstr "Normal alfa"
+#: libnautilus-private/nautilus-icon-container.c:4269
+msgid "Frame Text"
+msgstr "Rama in text"
+
+#: libnautilus-private/nautilus-icon-container.c:4270
+msgid "Draw a frame around unselected text"
+msgstr "Rita en ram runt omarkerad text"
+
+#: libnautilus-private/nautilus-icon-container.c:4276
+msgid "Selection Box Color"
+msgstr "Färg på markeringsruta"
+
+#: libnautilus-private/nautilus-icon-container.c:4277
+msgid "Color of the selection box"
+msgstr "Färg på markeringsrutan"
+
+#: libnautilus-private/nautilus-icon-container.c:4282
+msgid "Selection Box Alpha"
+msgstr "Alfa för markeringsruta"
+
+#: libnautilus-private/nautilus-icon-container.c:4283
+msgid "Opacity of the selection box"
+msgstr "Opacitet för markeringsrutan"
 
-#: ../libnautilus-private/nautilus-icon-container.c:4324
-msgid "Opacity of the normal icons if frame_text is set"
-msgstr "Opacitet för de normala ikonerna om frame_text är angivet"
+#: libnautilus-private/nautilus-icon-container.c:4290
+msgid "Highlight Alpha"
+msgstr "Färgmarkeringsalfa"
 
-#: ../libnautilus-private/nautilus-icon-dnd.c:790
+#: libnautilus-private/nautilus-icon-container.c:4291
+msgid "Opacity of the highlight for selected icons"
+msgstr "Opacitet för färgmarkeringen för markerade ikoner"
+
+#: libnautilus-private/nautilus-icon-container.c:4297
+msgid "Light Info Color"
+msgstr "Ljus informationsfärg"
+
+#: libnautilus-private/nautilus-icon-container.c:4298
+msgid "Color used for information text against a dark background"
+msgstr "Färg som används för informationstext mot en mörk bakgrund"
+
+#: libnautilus-private/nautilus-icon-container.c:4303
+msgid "Dark Info Color"
+msgstr "Mörk informationsfärg"
+
+#: libnautilus-private/nautilus-icon-container.c:4304
+msgid "Color used for information text against a light background"
+msgstr "Färg som används för informationstext mot en ljus bakgrund"
+
+#: libnautilus-private/nautilus-icon-dnd.c:754
+msgid ""
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
+msgstr ""
+"Vill du byta till manuell layout och lämna objektet där du släppte det? "
+"Detta kommer att skriva över den lagrade manuella layouten."
+
+#: libnautilus-private/nautilus-icon-dnd.c:756
+#: libnautilus-private/nautilus-icon-dnd.c:760
+#: libnautilus-private/nautilus-icon-dnd.c:765
+#: libnautilus-private/nautilus-icon-dnd.c:768
+msgid "This folder uses automatic layout."
+msgstr "Denna mapp använder automatisk layout."
+
+#: libnautilus-private/nautilus-icon-dnd.c:758
+msgid ""
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
+msgstr ""
+"Vill du byta till manuell layout och lämna dessa objekt där du släppte dem? "
+"Detta kommer att skriva över den lagrade manuella layouten."
+
+#: libnautilus-private/nautilus-icon-dnd.c:764
+msgid ""
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
+msgstr ""
+"Vill du byta till manuell layout och lämna detta objekt där du släppte det?"
+
+#: libnautilus-private/nautilus-icon-dnd.c:767
+msgid ""
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
+msgstr ""
+"Vill du byta till manuell layout och lämna dessa objekt där du släppte dem?"
+
+#: libnautilus-private/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Byt till manuell layout?"
 
-#: ../libnautilus-private/nautilus-icon-dnd.c:791
+#: libnautilus-private/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Byt"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:136
+#: libnautilus-private/nautilus-program-choosing.c:136
 msgid "Open Failed, would you like to choose another application?"
 msgstr "Öppnande misslyckades, vill du välja ett annat program?"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:137
+#: libnautilus-private/nautilus-program-choosing.c:137
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
@@ -2446,11 +2695,11 @@ msgstr ""
 "\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s"
 "\"-platser."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:142
+#: libnautilus-private/nautilus-program-choosing.c:142
 msgid "Open Failed, would you like to choose another action?"
 msgstr "Öppnande misslyckades, vill du välja en annan åtgärd?"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:143
+#: libnautilus-private/nautilus-program-choosing.c:143
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
@@ -2459,12 +2708,12 @@ msgstr ""
 "Standardåtgärden kan inte öppna \"%s\" eftersom den inte kan komma åt filer "
 "på \"%s\"-platser."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:150
-#: ../libnautilus-private/nautilus-program-choosing.c:183
+#: libnautilus-private/nautilus-program-choosing.c:150
+#: libnautilus-private/nautilus-program-choosing.c:183
 msgid "Can't Open Location"
 msgstr "Kan inte öppna plats"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:169
+#: libnautilus-private/nautilus-program-choosing.c:169
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
@@ -2473,7 +2722,7 @@ msgstr ""
 "\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s"
 "\"-platser."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:172
+#: libnautilus-private/nautilus-program-choosing.c:172
 msgid ""
 "No other applications are available to view this file.  If you copy this "
 "file onto your computer, you may be able to open it."
@@ -2481,7 +2730,7 @@ msgstr ""
 "Det finns inga andra tillgängliga program som kan visa denna fil. Om du "
 "kopierar denna fil till din dator kan du kanske öppna den."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:176
+#: libnautilus-private/nautilus-program-choosing.c:176
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\"."
@@ -2490,7 +2739,7 @@ msgstr ""
 "Standardåtgärden kan inte öppna \"%s\" eftersom den inte kan komma åt filer "
 "på \"%s\"-platser."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:178
+#: libnautilus-private/nautilus-program-choosing.c:178
 msgid ""
 "No other actions are available to view this file.  If you copy this file "
 "onto your computer, you may be able to open it."
@@ -2498,8 +2747,8 @@ msgstr ""
 "Det finns inga andra tillgängliga program som kan visa denna fil. Om du "
 "kopierar denna fil till din dator kan du kanske öppna den."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:492
-#: ../libnautilus-private/nautilus-program-choosing.c:723
+#: libnautilus-private/nautilus-program-choosing.c:492
+#: libnautilus-private/nautilus-program-choosing.c:723
 #, c-format
 msgid "Opening %s"
 msgstr "Öppnar %s"
@@ -2508,118 +2757,118 @@ msgstr "Öppnar %s"
 #. * and I found these in other places to reuse. We should make them
 #. * better later.
 #. Shouldn't have gotten this error unless there's a : separator.
-#: ../libnautilus-private/nautilus-program-choosing.c:580
-#: ../libnautilus-private/nautilus-program-choosing.c:591
-#: ../libnautilus-private/nautilus-program-choosing.c:599
-#: ../libnautilus-private/nautilus-program-choosing.c:604
-#: ../src/nautilus-window-manage-views.c:1358
-#: ../src/nautilus-window-manage-views.c:1364
-#: ../src/nautilus-window-manage-views.c:1392
-#: ../src/nautilus-window-manage-views.c:1400
-#: ../src/nautilus-window-manage-views.c:1406
-#: ../src/nautilus-window-manage-views.c:1427
+#: libnautilus-private/nautilus-program-choosing.c:580
+#: libnautilus-private/nautilus-program-choosing.c:591
+#: libnautilus-private/nautilus-program-choosing.c:599
+#: libnautilus-private/nautilus-program-choosing.c:604
+#: src/nautilus-window-manage-views.c:1343
+#: src/nautilus-window-manage-views.c:1349
+#: src/nautilus-window-manage-views.c:1377
+#: src/nautilus-window-manage-views.c:1385
+#: src/nautilus-window-manage-views.c:1391
+#: src/nautilus-window-manage-views.c:1412
 #, c-format
 msgid "Couldn't display \"%s\"."
 msgstr "Kunde inte visa \"%s\"."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:593
-#: ../libnautilus-private/nautilus-program-choosing.c:890
-#: ../libnautilus-private/nautilus-program-choosing.c:961
+#: libnautilus-private/nautilus-program-choosing.c:593
+#: libnautilus-private/nautilus-program-choosing.c:888
+#: libnautilus-private/nautilus-program-choosing.c:957
 msgid "There was an error launching the application."
 msgstr "Det inträffade ett fel vid start av programmet."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:601
-#: ../src/nautilus-window-manage-views.c:1402
+#: libnautilus-private/nautilus-program-choosing.c:601
+#: src/nautilus-window-manage-views.c:1387
 msgid "The attempt to log in failed."
 msgstr "Inloggningsförsöket misslyckades."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:606
-#: ../src/nautilus-window-manage-views.c:1408
+#: libnautilus-private/nautilus-program-choosing.c:606
+#: src/nautilus-window-manage-views.c:1393
 msgid "Access was denied."
 msgstr "Ã…tkomst nekades."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:611
-#: ../src/nautilus-window-manage-views.c:1419
+#: libnautilus-private/nautilus-program-choosing.c:611
+#: src/nautilus-window-manage-views.c:1404
 #, c-format
 msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Kunde inte visa \"%s\", eftersom värden \"%s\" inte kunde hittas."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:614
-#: ../src/nautilus-window-manage-views.c:1422
+#: libnautilus-private/nautilus-program-choosing.c:614
+#: src/nautilus-window-manage-views.c:1407
 msgid ""
 "Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Kontrollera att du stavat namnet rätt och att dina proxyserverinställningar "
 "stämmer."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:619
-#: ../src/nautilus-connect-server-dialog.c:142
-#: ../src/nautilus-window-manage-views.c:1380
+#: libnautilus-private/nautilus-program-choosing.c:619
+#: src/nautilus-connect-server-dialog.c:140
+#: src/nautilus-window-manage-views.c:1365
 #, c-format
 msgid "\"%s\" is not a valid location."
 msgstr "\"%s\" är inte en giltig plats."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:622
-#: ../libnautilus-private/nautilus-program-choosing.c:629
-#: ../src/nautilus-connect-server-dialog.c:144
-#: ../src/nautilus-property-browser.c:1152
-#: ../src/nautilus-window-manage-views.c:1375
-#: ../src/nautilus-window-manage-views.c:1383
+#: libnautilus-private/nautilus-program-choosing.c:622
+#: libnautilus-private/nautilus-program-choosing.c:629
+#: src/nautilus-connect-server-dialog.c:142
+#: src/nautilus-property-browser.c:1097
+#: src/nautilus-window-manage-views.c:1360
+#: src/nautilus-window-manage-views.c:1368
 msgid "Please check the spelling and try again."
 msgstr "Kontrollera stavningen och försök igen."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:626
-#: ../src/nautilus-window-manage-views.c:1372
+#: libnautilus-private/nautilus-program-choosing.c:626
+#: src/nautilus-window-manage-views.c:1357
 #, c-format
 msgid "Couldn't find \"%s\"."
 msgstr "Kunde inte hitta \"%s\"."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:644
-#: ../src/nautilus-connect-server-dialog-main.c:72
-#: ../src/nautilus-window-manage-views.c:1448
+#: libnautilus-private/nautilus-program-choosing.c:644
+#: src/nautilus-connect-server-dialog-main.c:71
+#: src/nautilus-window-manage-views.c:1433
 msgid "Can't Display Location"
 msgstr "Kan inte visa plats"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:875
+#: libnautilus-private/nautilus-program-choosing.c:873
 msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "Tyvärr, men du kan inte köra kommandon från en fjärrplats."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:877
+#: libnautilus-private/nautilus-program-choosing.c:875
 msgid "This is disabled due to security considerations."
 msgstr "Detta är inaktiverat på grund av säkerhetsskäl."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:878
+#: libnautilus-private/nautilus-program-choosing.c:876
 msgid "Can't Execute Remote Links"
 msgstr "Kunde inte köra fjärrlänkar"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:888
-#: ../libnautilus-private/nautilus-program-choosing.c:959
+#: libnautilus-private/nautilus-program-choosing.c:886
+#: libnautilus-private/nautilus-program-choosing.c:955
 msgid "Details: "
 msgstr "Detaljer: "
 
-#: ../libnautilus-private/nautilus-program-choosing.c:892
-#: ../libnautilus-private/nautilus-program-choosing.c:963
+#: libnautilus-private/nautilus-program-choosing.c:890
+#: libnautilus-private/nautilus-program-choosing.c:959
 msgid "Error Launching Application"
 msgstr "Fel vid start av program"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:920
-#: ../libnautilus-private/nautilus-program-choosing.c:932
+#: libnautilus-private/nautilus-program-choosing.c:918
+#: libnautilus-private/nautilus-program-choosing.c:930
 msgid "This drop target only supports local files."
 msgstr "Detta släppmål stöder endast lokala filer."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:921
+#: libnautilus-private/nautilus-program-choosing.c:919
 msgid ""
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "För att öppna icke-lokala filer kopierar du dem till en lokal mapp och "
 "släpper dem sedan igen."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:923
-#: ../libnautilus-private/nautilus-program-choosing.c:935
+#: libnautilus-private/nautilus-program-choosing.c:921
+#: libnautilus-private/nautilus-program-choosing.c:933
 msgid "Drop Target Only Supports Local Files"
 msgstr "Släppmål stöder endast lokala filer"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:933
+#: libnautilus-private/nautilus-program-choosing.c:931
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
@@ -2627,182 +2876,168 @@ msgstr ""
 "För att öppna icke-lokala filer kopierar du dem till en lokal mapp och "
 "släpper sedan dem igen. De lokala filerna du släppte har redan öppnats."
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:174
+#: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:175
+#: libnautilus-private/nautilus-undo-signal-handlers.c:175
 msgid "Undo Edit"
 msgstr "Ã…ngra redigering"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:176
+#: libnautilus-private/nautilus-undo-signal-handlers.c:176
 msgid "Undo the edit"
 msgstr "Ã…ngra redigeringen"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:177
+#: libnautilus-private/nautilus-undo-signal-handlers.c:177
 msgid "Redo Edit"
 msgstr "Gör om redigering"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:178
+#: libnautilus-private/nautilus-undo-signal-handlers.c:178
 msgid "Redo the edit"
 msgstr "Gör om redigeringen"
 
-#: ../nautilus-computer.desktop.in.h:2
+#: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
 msgstr "Visa din datorlagringsplats"
 
-#: ../nautilus-file-management-properties.desktop.in.h:1
+#: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
 msgstr "Ändra hur filer hanteras"
 
-#: ../nautilus-file-management-properties.desktop.in.h:2
+#: nautilus-file-management-properties.desktop.in.h:2
 msgid "File Management"
 msgstr "Filhantering"
 
-#: ../nautilus-home.desktop.in.h:1 ../src/file-manager/fm-tree-view.c:1243
+#: nautilus-home.desktop.in.h:1 src/file-manager/fm-tree-view.c:1252
 msgid "Home Folder"
 msgstr "Hemmapp"
 
-#: ../nautilus-home.desktop.in.h:2
+#: nautilus-home.desktop.in.h:2
 msgid "View your home folder in the Nautilus file manager"
 msgstr "Visa din hemmapp i filhanteraren Nautilus"
 
-#: ../nautilus.desktop.in.h:1
-msgid "Browse the file system with the file manager"
+#: nautilus.desktop.in.h:1
+msgid "Browse the filesystem with the file manager"
 msgstr "Bläddra i filsystemet med filhanteraren"
 
-#: ../nautilus.desktop.in.h:2
+#: nautilus.desktop.in.h:2
 msgid "File Browser"
 msgstr "Filbläddrare"
 
-#: ../src/Nautilus_shell.server.in.h:1
+#: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
 msgstr "Fabrik för skalet och filhanteraren Nautilus"
 
-#: ../src/Nautilus_shell.server.in.h:2
+#: src/Nautilus_shell.server.in.h:2
 msgid "Nautilus factory"
 msgstr "Nautilus-fabrik"
 
-#: ../src/Nautilus_shell.server.in.h:3
+#: src/Nautilus_shell.server.in.h:3
 msgid "Nautilus metafile factory"
 msgstr "Fabrik för Nautilus-metafil"
 
-#: ../src/Nautilus_shell.server.in.h:4
+#: src/Nautilus_shell.server.in.h:4
 msgid "Nautilus shell"
 msgstr "Nautilus-skal"
 
-#: ../src/Nautilus_shell.server.in.h:5
+#: src/Nautilus_shell.server.in.h:5
 msgid ""
 "Nautilus shell operations that can be done from subsequent command-line "
 "invocations"
 msgstr ""
 "Nautilus-skaloperationer som kan utföras genom upprepade kommandoradsanrop"
 
-#: ../src/Nautilus_shell.server.in.h:6
+#: src/Nautilus_shell.server.in.h:6
 msgid "Produces metafile objects for accessing Nautilus metadata"
 msgstr "Skapar metafil-objekt för att komma åt Nautilus-metadata"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:617
+#: src/file-manager/fm-desktop-icon-view.c:625
 msgid "Background"
 msgstr "Bakgrund"
 
-#. name, stock id
-#: ../src/file-manager/fm-desktop-icon-view.c:680
-#: ../src/file-manager/fm-directory-view.c:6154
-#: ../src/file-manager/fm-directory-view.c:6841
+#: src/file-manager/fm-desktop-icon-view.c:688
 msgid "E_mpty Trash"
 msgstr "T_öm papperskorgen"
 
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:698
+msgid "Open T_erminal"
+msgstr "Öppna _terminalfönster"
+
 #. label, accelerator
+#: src/file-manager/fm-desktop-icon-view.c:699
+msgid "Open a new GNOME terminal window"
+msgstr "Öppna ett nytt GNOME-terminalfönster"
+
 #. name, stock id
-#: ../src/file-manager/fm-desktop-icon-view.c:692
-#: ../src/file-manager/fm-directory-view.c:6126
-msgid "Create L_auncher..."
-msgstr "Skapa st_artare..."
+#: src/file-manager/fm-desktop-icon-view.c:702
+#: src/file-manager/fm-directory-view.c:5739
+msgid "Create L_auncher"
+msgstr "Skapa st_artare"
 
-#. tooltip
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:694
-#: ../src/file-manager/fm-directory-view.c:6127
+#: src/file-manager/fm-desktop-icon-view.c:703
+#: src/file-manager/fm-directory-view.c:5740
 msgid "Create a new launcher"
 msgstr "Skapa en ny startare"
 
-#. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:699
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:706
 msgid "Change Desktop _Background"
 msgstr "Byt skrivbordsbak_grund"
 
-#. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:701
+#. label, accelerator
+#: src/file-manager/fm-desktop-icon-view.c:707
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Visa ett fönster som låter dig ställa in mönstret eller färgen på din "
 "skrivbordsbakgrund"
 
-#. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:706
+#. name, stock id
+#: src/file-manager/fm-desktop-icon-view.c:710
 msgid "Empty Trash"
 msgstr "Töm papperskorgen"
 
-#. tooltip
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:708
-#: ../src/file-manager/fm-directory-view.c:6155
+#: src/file-manager/fm-desktop-icon-view.c:711
+#: src/file-manager/fm-directory-view.c:5768
 msgid "Delete all items in the Trash"
 msgstr "Ta bort alla objekt i papperskorgen"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:797
-#: ../src/nautilus-desktop-window.c:246 ../src/nautilus-pathbar.c:1130
-#: ../src/nautilus-pathbar.c:1134 ../src/nautilus-places-sidebar.c:161
+#: src/file-manager/fm-desktop-icon-view.c:800
+#: src/nautilus-desktop-window.c:365
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:798
-msgid "View as Desktop"
-msgstr "Visa som skrivbord"
-
-#: ../src/file-manager/fm-desktop-icon-view.c:799
-msgid "View as _Desktop"
-msgstr "Visa som _skrivbord"
-
-#: ../src/file-manager/fm-desktop-icon-view.c:800
-msgid "The desktop view encountered an error."
-msgstr "Skrivbordsvyn råkade ut för ett fel."
+#: src/file-manager/fm-desktop-icon-view.c:801
+msgid "_Desktop"
+msgstr "_Skrivbord"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:801
-msgid "The desktop view encountered an error while starting up."
-msgstr "Skrivbordsvyn råkade ut för ett fel vid uppstarten."
-
-#: ../src/file-manager/fm-desktop-icon-view.c:802
-msgid "Display this location with the desktop view."
-msgstr "Visa denna plats med skrivbordsvyn."
-
-#: ../src/file-manager/fm-directory-view.c:547
+#: src/file-manager/fm-directory-view.c:510
 #, c-format
 msgid "Open %d Window?"
 msgid_plural "Open %d Windows?"
 msgstr[0] "Öppna %d fönster?"
 msgstr[1] "Öppna %d fönster?"
 
-#: ../src/file-manager/fm-directory-view.c:548
+#: src/file-manager/fm-directory-view.c:511
 msgid "Are you sure you want to open all files?"
 msgstr "Är du säker att du vill öppna alla filer?"
 
-#: ../src/file-manager/fm-directory-view.c:549
-#: ../src/nautilus-location-bar.c:158
+#: src/file-manager/fm-directory-view.c:512 src/nautilus-location-bar.c:158
 #, c-format
 msgid "This will open %d separate window."
 msgid_plural "This will open %d separate windows."
 msgstr[0] "Detta kommer att öppna %d separat fönster."
 msgstr[1] "Detta kommer att öppna %d separata fönster."
 
-#: ../src/file-manager/fm-directory-view.c:857
+#: src/file-manager/fm-directory-view.c:813
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Är du säker att du vill ta bort \"%s\" permanent?"
 
-#: ../src/file-manager/fm-directory-view.c:861
+#: src/file-manager/fm-directory-view.c:817
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
 msgid_plural ""
@@ -2810,35 +3045,35 @@ msgid_plural ""
 msgstr[0] "Är du säker att du vill ta bort det markerade objektet permanent?"
 msgstr[1] "Är du säker att du vill ta bort de %d markerade objekten permanent?"
 
-#: ../src/file-manager/fm-directory-view.c:869
+#: src/file-manager/fm-directory-view.c:825
 msgid "If you delete an item, it is permanently lost."
 msgstr "Om du tar bort ett objekt är det borta för alltid."
 
-#: ../src/file-manager/fm-directory-view.c:870
+#: src/file-manager/fm-directory-view.c:826
 msgid "Delete?"
 msgstr "Ta bort?"
 
-#: ../src/file-manager/fm-directory-view.c:1022
+#: src/file-manager/fm-directory-view.c:977
 msgid "Select Pattern"
 msgstr "Välj mönster"
 
-#: ../src/file-manager/fm-directory-view.c:1038
+#: src/file-manager/fm-directory-view.c:993
 msgid "_Pattern:"
 msgstr "_Mönster:"
 
-#: ../src/file-manager/fm-directory-view.c:1865
+#: src/file-manager/fm-directory-view.c:1791
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" markerad"
 
-#: ../src/file-manager/fm-directory-view.c:1867
+#: src/file-manager/fm-directory-view.c:1793
 #, c-format
 msgid "%d folder selected"
 msgid_plural "%d folders selected"
 msgstr[0] "%d mapp markerad"
 msgstr[1] "%d mappar markerade"
 
-#: ../src/file-manager/fm-directory-view.c:1877
+#: src/file-manager/fm-directory-view.c:1803
 #, c-format
 msgid " (containing %d item)"
 msgid_plural " (containing %d items)"
@@ -2846,19 +3081,19 @@ msgstr[0] " (innehåller %d objekt)"
 msgstr[1] " (innehåller %d objekt)"
 
 #. translators: this is preceded with a string of form 'N folders' (N more than 1)
-#: ../src/file-manager/fm-directory-view.c:1888
+#: src/file-manager/fm-directory-view.c:1814
 #, c-format
 msgid " (containing a total of %d item)"
 msgid_plural " (containing a total of %d items)"
 msgstr[0] " (innehållandes totalt %d objekt)"
 msgstr[1] " (innehållandes totalt %d objekt)"
 
-#: ../src/file-manager/fm-directory-view.c:1904
+#: src/file-manager/fm-directory-view.c:1830
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" markerad (%s)"
 
-#: ../src/file-manager/fm-directory-view.c:1908
+#: src/file-manager/fm-directory-view.c:1834
 #, c-format
 msgid "%d item selected (%s)"
 msgid_plural "%d items selected (%s)"
@@ -2866,14 +3101,14 @@ msgstr[0] "%d objekt markerat (%s)"
 msgstr[1] "%d objekt markerade (%s)"
 
 #. Folders selected also, use "other" terminology
-#: ../src/file-manager/fm-directory-view.c:1916
+#: src/file-manager/fm-directory-view.c:1842
 #, c-format
 msgid "%d other item selected (%s)"
 msgid_plural "%d other items selected (%s)"
 msgstr[0] "%d annat objekt markerat (%s)"
 msgstr[1] "%d andra objekt markerade (%s)"
 
-#: ../src/file-manager/fm-directory-view.c:1937
+#: src/file-manager/fm-directory-view.c:1863
 #, c-format
 msgid "%s, Free space: %s"
 msgstr "%s, ledigt utrymme: %s"
@@ -2885,7 +3120,7 @@ msgstr "%s, ledigt utrymme: %s"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: ../src/file-manager/fm-directory-view.c:1962
+#: src/file-manager/fm-directory-view.c:1888
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -2894,61 +3129,51 @@ 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:2032
+#: src/file-manager/fm-directory-view.c:1958
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr "Mappen \"%s\" innehåller fler filer än Nautilus kan visa."
 
-#: ../src/file-manager/fm-directory-view.c:2038
+#: src/file-manager/fm-directory-view.c:1964
 msgid "Some files will not be displayed."
 msgstr "En del filer kommer inte att visas."
 
-#: ../src/file-manager/fm-directory-view.c:2039
+#: src/file-manager/fm-directory-view.c:1965
 msgid "Too Many Files"
 msgstr "För många filer"
 
-#: ../src/file-manager/fm-directory-view.c:3353
+#: src/file-manager/fm-directory-view.c:3113
 msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "Kan inte flytta filen till papperskorgen. Vill du ta bort den omedelbart?"
 
-#: ../src/file-manager/fm-directory-view.c:3354
+#: src/file-manager/fm-directory-view.c:3114
 #, c-format
 msgid "The file \"%s\" cannot be moved to the trash."
 msgstr "Filen \"%s\" kan inte flyttas till papperskorgen."
 
-#: ../src/file-manager/fm-directory-view.c:3358
+#: src/file-manager/fm-directory-view.c:3118
 msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
 "Kan inte flytta objekt till papperskorgen. Vill du ta bort dem omedelbart?"
 
-#: ../src/file-manager/fm-directory-view.c:3359
-#, c-format
-msgid "None of the %d selected items can be moved to the Trash"
-msgstr "Inga av de %d markerade objekten kan flyttas till papperskorgen"
-
-#: ../src/file-manager/fm-directory-view.c:3361
+#: src/file-manager/fm-directory-view.c:3121
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 "Kan inte flytta en del objekt till papperskorgen. Vill du ta bort dessa "
 "omedelbart?"
 
-#: ../src/file-manager/fm-directory-view.c:3362
-#, c-format
-msgid "%d of the selected items cannot be moved to the Trash"
-msgstr "%d av de markerade objekten kan inte flyttas till papperskorgen"
-
-#: ../src/file-manager/fm-directory-view.c:3368
+#: src/file-manager/fm-directory-view.c:3128
 msgid "Delete Immediately?"
 msgstr "Ta bort omedelbart?"
 
-#: ../src/file-manager/fm-directory-view.c:3400
+#: src/file-manager/fm-directory-view.c:3160
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Är du säker att du vill ta bort \"%s\" permanent från papperskorgen?"
 
-#: ../src/file-manager/fm-directory-view.c:3404
+#: src/file-manager/fm-directory-view.c:3164
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected item from the "
@@ -2963,56 +3188,56 @@ msgstr[1] ""
 "Är du säker att du vill ta bort de %d markerade objekten i papperskorgen "
 "permanent?"
 
-#: ../src/file-manager/fm-directory-view.c:3413
+#: src/file-manager/fm-directory-view.c:3173
 msgid "If you delete an item, it will be permanently lost."
 msgstr "Om du tar bort ett objekt är det borta för alltid."
 
-#: ../src/file-manager/fm-directory-view.c:3414
+#: src/file-manager/fm-directory-view.c:3174
 msgid "Delete From Trash?"
 msgstr "Ta bort från papperskorgen?"
 
-#: ../src/file-manager/fm-directory-view.c:3951
+#: src/file-manager/fm-directory-view.c:3658
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Öppna med \"%s\""
 
-#: ../src/file-manager/fm-directory-view.c:3952
+#: src/file-manager/fm-directory-view.c:3659
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Använd \"%s\" för att öppna det markerade objektet"
 
-#: ../src/file-manager/fm-directory-view.c:4041
+#: src/file-manager/fm-directory-view.c:3748
 #, c-format
 msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "Vill du köra \"%s\" eller visa dess innehåll?"
 
-#: ../src/file-manager/fm-directory-view.c:4043
+#: src/file-manager/fm-directory-view.c:3750
 #, c-format
 msgid "\"%s\" is an executable text file."
 msgstr "\"%s\" är en körbar textfil."
 
-#: ../src/file-manager/fm-directory-view.c:4049
+#: src/file-manager/fm-directory-view.c:3756
 msgid "Run or Display?"
 msgstr "Kör eller visa?"
 
-#: ../src/file-manager/fm-directory-view.c:4050
+#: src/file-manager/fm-directory-view.c:3757
 msgid "Run in _Terminal"
 msgstr "Kör i _terminal"
 
-#: ../src/file-manager/fm-directory-view.c:4051
+#: src/file-manager/fm-directory-view.c:3758
 msgid "_Display"
 msgstr "_Visa"
 
-#: ../src/file-manager/fm-directory-view.c:4054
+#: src/file-manager/fm-directory-view.c:3761
 msgid "_Run"
 msgstr "_Kör"
 
-#: ../src/file-manager/fm-directory-view.c:4440
+#: src/file-manager/fm-directory-view.c:4147
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kan inte öppna %s"
 
-#: ../src/file-manager/fm-directory-view.c:4443
+#: src/file-manager/fm-directory-view.c:4150
 #, c-format
 msgid ""
 "The filename \"%s\" indicates that this file is of type \"%s\". The contents "
@@ -3033,21 +3258,21 @@ msgstr ""
 "filändelsen för \"%s\" och öppnar sedan filen normalt. Alternativt kan du "
 "använda menyn Öppna med för att välja ett specifikt program för filen."
 
-#: ../src/file-manager/fm-directory-view.c:4830
+#: src/file-manager/fm-directory-view.c:4571
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Kör \"%s\" på alla markerade objekt"
 
-#: ../src/file-manager/fm-directory-view.c:5079
+#: src/file-manager/fm-directory-view.c:4820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Skapa dokument från mallen \"%s\""
 
-#: ../src/file-manager/fm-directory-view.c:5285
+#: src/file-manager/fm-directory-view.c:5026
 msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "Alla körbara filer i denna mapp kommer att visas i Skript-menyn."
 
-#: ../src/file-manager/fm-directory-view.c:5287
+#: src/file-manager/fm-directory-view.c:5028
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
@@ -3055,11 +3280,11 @@ msgstr ""
 "Genom att välja ett skript från menyn kör du det skriptet med alla markerade "
 "objekt som indata."
 
-#: ../src/file-manager/fm-directory-view.c:5289
+#: src/file-manager/fm-directory-view.c:5030
 msgid "About Scripts"
 msgstr "Om skript"
 
-#: ../src/file-manager/fm-directory-view.c:5290
+#: src/file-manager/fm-directory-view.c:5031
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -3098,115 +3323,121 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: det aktuella fönstrets position och storlek"
 
-#: ../src/file-manager/fm-directory-view.c:5451
-#: ../src/file-manager/fm-tree-view.c:900
+#: src/file-manager/fm-directory-view.c:5194
+#: src/file-manager/fm-tree-view.c:895
 #, c-format
-msgid "\"%s\" will be moved if you select the Paste command"
-msgstr "\"%s\" kommer att flyttas om du väljer kommandot Klistra in"
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr "\"%s\" kommer att flyttas om du väljer kommandot Klistra in filer"
 
-#: ../src/file-manager/fm-directory-view.c:5455
-#: ../src/file-manager/fm-tree-view.c:904
+#: src/file-manager/fm-directory-view.c:5198
+#: src/file-manager/fm-tree-view.c:899
 #, c-format
-msgid "\"%s\" will be copied if you select the Paste command"
-msgstr "\"%s\" kommer att kopieras om du väljer kommandot Klistra in"
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr "\"%s\" kommer att kopieras om du väljer kommandot Klistra in filer"
 
-#: ../src/file-manager/fm-directory-view.c:5462
+#: src/file-manager/fm-directory-view.c:5205
 #, c-format
-msgid "The %d selected item will be moved if you select the Paste command"
+msgid ""
+"The %d selected item will be moved if you select the Paste Files command"
 msgid_plural ""
-"The %d selected items will be moved if you select the Paste command"
+"The %d selected items will be moved if you select the Paste Files command"
 msgstr[0] ""
-"Det %d markerade objektet kommer att flyttas om du väljer kommandot Klistra "
-"in"
+"Det markerade objektet kommer att flyttas om du väljer kommandot Klistra in "
+"filer"
 msgstr[1] ""
-"De %d markerade objekten kommer att flyttas om du väljer kommandot Klistra in"
+"De %d markerade objekten kommer att flyttas om du väljer kommandot Klistra "
+"in filer"
 
-#: ../src/file-manager/fm-directory-view.c:5469
+#: src/file-manager/fm-directory-view.c:5212
 #, c-format
-msgid "The %d selected item will be copied if you select the Paste command"
+msgid ""
+"The %d selected item will be copied if you select the Paste Files command"
 msgid_plural ""
-"The %d selected items will be copied if you select the Paste command"
+"The %d selected items will be copied if you select the Paste Files command"
 msgstr[0] ""
-"Det %d markerade objektet kommer att kopieras om du väljer kommandot Klistra "
-"in"
+"Det markerade objektet kommer att kopieras om du väljer kommandot Klistra in "
+"filer"
 msgstr[1] ""
 "De %d markerade objekten kommer att kopieras om du väljer kommandot Klistra "
-"in"
+"in filer"
 
-#: ../src/file-manager/fm-directory-view.c:5563
-#: ../src/file-manager/fm-tree-view.c:981
+#: src/file-manager/fm-directory-view.c:5293
+#: src/file-manager/fm-tree-view.c:975
 msgid "There is nothing on the clipboard to paste."
 msgstr "Det finns inget i Urklipp att klistra in."
 
-#: ../src/file-manager/fm-directory-view.c:5689
-#: ../src/file-manager/fm-directory-view.c:7330
+#: src/file-manager/fm-directory-view.c:5400
+#: src/file-manager/fm-directory-view.c:6787
 msgid "Mount Error"
 msgstr "Monteringsfel"
 
-#: ../src/file-manager/fm-directory-view.c:5746
-#: ../src/file-manager/fm-tree-view.c:1066
+#: src/file-manager/fm-directory-view.c:5457
+#: src/file-manager/fm-tree-view.c:1060
 msgid "Unmount Error"
 msgstr "Avmonteringsfel"
 
-#: ../src/file-manager/fm-directory-view.c:5759
-#: ../src/file-manager/fm-tree-view.c:1063
+#: src/file-manager/fm-directory-view.c:5470
+#: src/file-manager/fm-tree-view.c:1057
 msgid "Eject Error"
 msgstr "Utmatningsfel"
 
-#: ../src/file-manager/fm-directory-view.c:5908
+#: src/file-manager/fm-directory-view.c:5619
 #, c-format
 msgid "Connect to Server %s"
 msgstr "Anslut till servern %s"
 
-#: ../src/file-manager/fm-directory-view.c:5913
+#: src/file-manager/fm-directory-view.c:5624
 msgid "_Connect"
 msgstr "_Anslut"
 
-#: ../src/file-manager/fm-directory-view.c:5927
+#: src/file-manager/fm-directory-view.c:5638
 msgid "Link _name:"
 msgstr "Länk_namn:"
 
-#: ../src/file-manager/fm-directory-view.c:6100
+#: src/file-manager/fm-directory-view.c:5716
 msgid "Create _Document"
 msgstr "Skapa _dokument"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6101
+#: src/file-manager/fm-directory-view.c:5717
 msgid "Open Wit_h"
 msgstr "Ö_ppna med"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6102
+#: src/file-manager/fm-directory-view.c:5718
 msgid "Choose a program with which to open the selected item"
 msgstr "Välj ett program att öppna det markerade objektet med"
 
+#: src/file-manager/fm-directory-view.c:5719
+msgid "_Scripts"
+msgstr "_Skript"
+
+#. name, stock id, label
+#: src/file-manager/fm-directory-view.c:5720
+msgid "Run or manage scripts from ~/.gnome2/nautilus-scripts"
+msgstr "Kör eller hantera skript från ~/.gnome2/nautilus-scripts"
+
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6104
-#: ../src/file-manager/fm-directory-view.c:6112
+#: src/file-manager/fm-directory-view.c:5722
 msgid "_Properties"
 msgstr "_Egenskaper"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6105
+#: src/file-manager/fm-directory-view.c:5723
 msgid "View or modify the properties of each selected item"
-msgstr "Visa eller ändra egenskaperna för varje markerat objekt"
-
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6113
-msgid "View or modify the properties of the open folder"
-msgstr "Visa eller ändra egenskaperna för den öppna mappen"
+msgstr "Visa eller ändra egenskaperna på varje markerat objekt"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6116
+#: src/file-manager/fm-directory-view.c:5730
 msgid "Create _Folder"
 msgstr "Skapa _mapp"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6117
+#: src/file-manager/fm-directory-view.c:5731
 msgid "Create a new empty folder inside this folder"
 msgstr "Skapa en ny tom mapp inuti denna mapp"
 
-#: ../src/file-manager/fm-directory-view.c:6119
+#: src/file-manager/fm-directory-view.c:5733
 msgid "No templates Installed"
 msgstr "Inga mallar är installerade"
 
@@ -3214,458 +3445,426 @@ msgstr "Inga mallar är installerade"
 # http://bugzilla.gnome.org/show_bug.cgi?id=145307
 #. name, stock id, label
 #. name, stock id
-#. translators: this is used to indicate that a file doesn't contain anything
-#: ../src/file-manager/fm-directory-view.c:6122
+#: src/file-manager/fm-directory-view.c:5735
 msgid "_Empty File"
 msgstr "_Tom fil"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6123
+#: src/file-manager/fm-directory-view.c:5736
 msgid "Create a new empty file inside this folder"
 msgstr "Skapa en ny tom fil inuti denna mapp"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6130
-#: ../src/file-manager/fm-directory-view.c:6742
-#: ../src/file-manager/fm-tree-view.c:1105
+#: src/file-manager/fm-directory-view.c:5743
+#: src/file-manager/fm-directory-view.c:6220
 msgid "_Open"
 msgstr "_Öppna"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6131
+#: src/file-manager/fm-directory-view.c:5744
 msgid "Open the selected item in this window"
 msgstr "Öppna det markerade objektet i detta fönster"
 
 #. name, stock id
-#. Location-specific actions
-#. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6138
-#: ../src/file-manager/fm-directory-view.c:6234
+#: src/file-manager/fm-directory-view.c:5751
 msgid "Open in Navigation Window"
 msgstr "Öppna i navigeringsfönster"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6139
+#: src/file-manager/fm-directory-view.c:5752
 msgid "Open each selected item in a navigation window"
 msgstr "Öppna varje markerat objekt i ett navigeringsfönster"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6142
-#: ../src/file-manager/fm-directory-view.c:6146
+#: src/file-manager/fm-directory-view.c:5755
+#: src/file-manager/fm-directory-view.c:5759
 msgid "Open with Other _Application..."
 msgstr "Öppna med annat _program..."
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6143
-#: ../src/file-manager/fm-directory-view.c:6147
+#: src/file-manager/fm-directory-view.c:5756
+#: src/file-manager/fm-directory-view.c:5760
 msgid "Choose another application with which to open the selected item"
 msgstr "Välj ett annat program att öppna det markerade objektet med"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6150
+#: src/file-manager/fm-directory-view.c:5763
 msgid "_Open Scripts Folder"
 msgstr "_Öppna skriptmapp"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6151
+#: src/file-manager/fm-directory-view.c:5764
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Visa mappen som innehåller de skript som visas i denna meny"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5771
+#: src/file-manager/fm-directory-view.c:6332
+msgid "Cu_t Files"
+msgstr "Klipp _ut filer"
+
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6159
-msgid "Prepare the selected files to be moved with a Paste command"
-msgstr "Förbered för de markerade filerna att flyttas med kommandot Klistra in"
+#: src/file-manager/fm-directory-view.c:5772
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+"Förbered för de markerade filerna att flyttas med kommandot Klistra in filer"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5775
+#: src/file-manager/fm-directory-view.c:6341
+msgid "_Copy Files"
+msgstr "_Kopiera filer"
+
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6163
-msgid "Prepare the selected files to be copied with a Paste command"
+#: src/file-manager/fm-directory-view.c:5776
+msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
-"Förbered för de markerade filerna att kopieras med kommandot Klistra in"
+"Förbered för de markerade filerna att kopieras med kommandot Klistra in filer"
 
 #. name, stock id
+#: src/file-manager/fm-directory-view.c:5779
+msgid "_Paste Files"
+msgstr "Klistra _in filer"
+
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6167
-msgid "Move or copy files previously selected by a Cut or Copy command"
+#: src/file-manager/fm-directory-view.c:5780
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
-"Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut eller "
-"Kopiera"
+"Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut filer "
+"eller Kopiera filer"
 
 #. We make accelerator "" instead of null here to not inherit the stock
 #. accelerator for paste
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6172
-#: ../src/file-manager/fm-tree-view.c:1163
-msgid "_Paste Into Folder"
-msgstr "Klistra _in i mapp"
+#: src/file-manager/fm-directory-view.c:5785
+msgid "_Paste Files Into Folder"
+msgstr "Klistra _in filer i mapp"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6173
+#: src/file-manager/fm-directory-view.c:5786
 msgid ""
-"Move or copy files previously selected by a Cut or Copy command into the "
-"selected folder"
+"Move or copy files previously selected by a Cut Files or Copy Files command "
+"into the selected folder"
 msgstr ""
-"Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut eller "
-"Kopiera till den markerade mappen"
+"Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut filer "
+"eller Kopiera filer till den markerade mappen"
+
+#. name, stock id
+#: src/file-manager/fm-directory-view.c:5789
+msgid "Select _All Files"
+msgstr "_Markera alla filer"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6177
+#: src/file-manager/fm-directory-view.c:5790
 msgid "Select all items in this window"
 msgstr "Markera alla objekt i detta fönster"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6180
+#: src/file-manager/fm-directory-view.c:5793
 msgid "Select _Pattern"
 msgstr "Markera _mönster"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6181
+#: src/file-manager/fm-directory-view.c:5794
 msgid "Select items in this window matching a given pattern"
 msgstr "Markera objekt i detta fönster som matchar ett givet mönster"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6184
+#: src/file-manager/fm-directory-view.c:5797
 msgid "D_uplicate"
 msgstr "_Duplicera"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6185
+#: src/file-manager/fm-directory-view.c:5798
 msgid "Duplicate each selected item"
 msgstr "Duplicera varje markerat objekt"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6188
-#: ../src/file-manager/fm-directory-view.c:6815
+#: src/file-manager/fm-directory-view.c:5801
+#: src/file-manager/fm-directory-view.c:6297
 msgid "Ma_ke Link"
-msgid_plural "Ma_ke Links"
-msgstr[0] "Sk_apa länk"
-msgstr[1] "Sk_apa länkar"
+msgstr "Sk_apa länk"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6189
+#: src/file-manager/fm-directory-view.c:5802
 msgid "Create a symbolic link for each selected item"
 msgstr "Skapa en symbolisk länk för varje markerat objekt"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6192
+#: src/file-manager/fm-directory-view.c:5805
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6193
+#: src/file-manager/fm-directory-view.c:5806
 msgid "Rename selected item"
 msgstr "Byt namn på markerat objekt"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6200
-#: ../src/file-manager/fm-directory-view.c:6248
-#: ../src/file-manager/fm-directory-view.c:6616
-#: ../src/file-manager/fm-directory-view.c:6783
-#: ../src/file-manager/fm-directory-view.c:7128
+#: src/file-manager/fm-directory-view.c:5809
+#: src/file-manager/fm-directory-view.c:6263
+#: src/file-manager/fm-directory-view.c:6585
 msgid "Mo_ve to Trash"
 msgstr "_Flytta till papperskorgen"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6201
-#: ../src/file-manager/fm-directory-view.c:6784
+#: src/file-manager/fm-directory-view.c:5810
+#: src/file-manager/fm-directory-view.c:6264
 msgid "Move each selected item to the Trash"
 msgstr "Flytta varje markerat objekt till papperskorgen"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6204
-#: ../src/file-manager/fm-directory-view.c:6252
-#: ../src/file-manager/fm-directory-view.c:6802
+#: src/file-manager/fm-directory-view.c:5813
+#: src/file-manager/fm-directory-view.c:6282
 msgid "_Delete"
 msgstr "_Ta bort"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6205
+#: src/file-manager/fm-directory-view.c:5814
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Ta bort varje markerat objekt, utan att flytta till papperskorgen"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6208
+#: src/file-manager/fm-directory-view.c:5817
 msgid "Reset View to _Defaults"
 msgstr "_Återställ vy till standardalternativ"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6209
+#: src/file-manager/fm-directory-view.c:5818
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Återställ sorteringsordning och zoomnivå för att stämma överens med "
 "inställningarna för denna vy"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6212
+#: src/file-manager/fm-directory-view.c:5821
 msgid "Connect To This Server"
 msgstr "Anslut till denna server"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6213
+#: src/file-manager/fm-directory-view.c:5822
 msgid "Make a permanent connection to this server"
 msgstr "Skapa en permanent anslutning till denna server"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6216
+#: src/file-manager/fm-directory-view.c:5825
 msgid "_Mount Volume"
 msgstr "_Montera volym"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6217
+#: src/file-manager/fm-directory-view.c:5826
 msgid "Mount the selected volume"
 msgstr "Montera den valda volymen"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6220
-#: ../src/file-manager/fm-tree-view.c:750
+#: src/file-manager/fm-directory-view.c:5829
+#: src/file-manager/fm-tree-view.c:745
 msgid "_Unmount Volume"
 msgstr "_Avmontera volym"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6221
+#: src/file-manager/fm-directory-view.c:5830
 msgid "Unmount the selected volume"
 msgstr "Avmontera den valda volymen"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6224
+#: src/file-manager/fm-directory-view.c:5833
 msgid "_Eject"
 msgstr "_Mata ut"
 
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6225
+#: src/file-manager/fm-directory-view.c:5834
 msgid "Eject the selected volume"
 msgstr "Mata ut den valda volymen"
 
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6228
+#: src/file-manager/fm-directory-view.c:5837
 msgid "Open File and Close window"
 msgstr "Öppna fil och stäng fönster"
 
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6235
-msgid "Open this folder in a navigation window"
-msgstr "Öppna denna mapp i ett navigeringsfönster"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6240
-msgid "Prepare this folder to be moved with a Paste command"
-msgstr "Förbered för denna mapp att flyttas med kommandot Klistra in"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6244
-msgid "Prepare this folder to be copied with a Paste command"
-msgstr "Förbered för denna mapp att kopieras med kommandot Klistra in"
-
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6249
-msgid "Move this folder to the Trash"
-msgstr "Flytta denna mapp till papperskorgen"
-
-#. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6253
-msgid "Delete this folder, without moving to the Trash"
-msgstr "Ta bort denna mapp, utan att flytta till papperskorgen"
-
 #. name, stock id
-#: ../src/file-manager/fm-directory-view.c:6259
+#: src/file-manager/fm-directory-view.c:5844
 msgid "Show _Hidden Files"
 msgstr "Visa _dolda filer"
 
+# Passiv formulering?
+# http://bugzilla.gnome.org/show_bug.cgi?id=145306
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6260
-msgid "Toggle the display of hidden files in the current window"
-msgstr "Växla visningen av dolda filer i det aktuella fönstret"
+#: src/file-manager/fm-directory-view.c:5845
+msgid "Toggles the display of hidden files in the current window"
+msgstr "Växlar visningen av dolda filer i det aktuella fönstret"
 
-#. Translators: %s is a directory
-#: ../src/file-manager/fm-directory-view.c:6309
+#: src/file-manager/fm-directory-view.c:6209
 #, c-format
-msgid "Run or manage scripts from %s"
-msgstr "Kör eller hantera skript från %s"
-
-#. Create a script action here specially because its tooltip is dynamic
-#: ../src/file-manager/fm-directory-view.c:6311
-msgid "_Scripts"
-msgstr "_Skript"
+msgid "_Open with \"%s\""
+msgstr "_Öppna med \"%s\""
 
 #. add the "open in new window" menu item
-#: ../src/file-manager/fm-directory-view.c:6585
-#: ../src/file-manager/fm-directory-view.c:6751
-#: ../src/file-manager/fm-tree-view.c:1116
+#: src/file-manager/fm-directory-view.c:6229
+#: src/file-manager/fm-directory-view.c:6231
+#: src/file-manager/fm-tree-view.c:1110
+#, c-format
 msgid "Open in New Window"
-msgstr "Öppna i nytt fönster"
+msgid_plural "Open in %d New Windows"
+msgstr[0] "Öppna i nytt fönster"
+msgstr[1] "Öppna i %d nya fönster"
 
-#: ../src/file-manager/fm-directory-view.c:6587
-#: ../src/file-manager/fm-directory-view.c:6759
+#: src/file-manager/fm-directory-view.c:6238
 msgid "_Browse Folder"
-msgid_plural "_Browse Folders"
-msgstr[0] "_Bläddra i mapp"
-msgstr[1] "_Bläddra i mappar"
+msgstr "_Bläddra i mapp"
+
+#: src/file-manager/fm-directory-view.c:6240
+msgid "_Browse Folders"
+msgstr "_Bläddra i mappar"
 
-#: ../src/file-manager/fm-directory-view.c:6612
-#: ../src/file-manager/fm-directory-view.c:6779
+#: src/file-manager/fm-directory-view.c:6259
 msgid "_Delete from Trash"
 msgstr "_Ta bort från papperskorgen"
 
-#: ../src/file-manager/fm-directory-view.c:6613
-msgid "Delete the open folder permanently"
-msgstr "Ta bort den öppna mappen permanent"
-
-#: ../src/file-manager/fm-directory-view.c:6617
-msgid "Move the open folder to the Trash"
-msgstr "Flytta den öppna mappen till papperskorgen"
+#: src/file-manager/fm-directory-view.c:6260
+msgid "Delete all selected items permanently"
+msgstr "Ta bort alla markerade objekt permanent"
 
-#: ../src/file-manager/fm-directory-view.c:6731
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Öppna med \"%s\""
+#: src/file-manager/fm-directory-view.c:6296
+msgid "Ma_ke Links"
+msgstr "Sk_apa länkar"
 
-#: ../src/file-manager/fm-directory-view.c:6753
-#, c-format
-msgid "Open in %d New Window"
-msgid_plural "Open in %d New Windows"
-msgstr[0] "Öppna i %d nytt fönster"
-msgstr[1] "Öppna i %d nya fönster"
+#: src/file-manager/fm-directory-view.c:6331
+msgid "Cu_t File"
+msgstr "Klipp _ut fil"
 
-#: ../src/file-manager/fm-directory-view.c:6780
-msgid "Delete all selected items permanently"
-msgstr "Ta bort alla markerade objekt permanent"
+#: src/file-manager/fm-directory-view.c:6340
+msgid "_Copy File"
+msgstr "_Kopiera fil"
 
-#: ../src/file-manager/fm-directory-view.c:7119
+#: src/file-manager/fm-directory-view.c:6576
 msgid "The link is broken, do you want to move it to the Trash?"
 msgstr "Länken är trasig. Vill du flytta den till papperskorgen?"
 
-#: ../src/file-manager/fm-directory-view.c:7121
+#: src/file-manager/fm-directory-view.c:6578
 msgid "This link can't be used, because it has no target."
 msgstr "Denna länk kan inte användas eftersom den inte har något mål."
 
-#: ../src/file-manager/fm-directory-view.c:7123
+#: src/file-manager/fm-directory-view.c:6580
 #, c-format
 msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr "Denna länk kan inte användas eftersom dess mål \"%s\" inte finns."
 
-#: ../src/file-manager/fm-directory-view.c:7128
+#: src/file-manager/fm-directory-view.c:6585
 msgid "Broken Link"
 msgstr "Trasig länk"
 
-#: ../src/file-manager/fm-directory-view.c:7448
+#: src/file-manager/fm-directory-view.c:6905
 #, c-format
 msgid "Opening \"%s\"."
 msgstr "Öppnar \"%s\"."
 
-#: ../src/file-manager/fm-directory-view.c:7455
+#: src/file-manager/fm-directory-view.c:6912
 msgid "Cancel Open?"
 msgstr "Avbryt öppning?"
 
-#: ../src/file-manager/fm-directory-view.c:8341
+#: src/file-manager/fm-directory-view.c:7791
 msgid "Download location?"
 msgstr "Hämta plats?"
 
-#: ../src/file-manager/fm-directory-view.c:8344
+#: src/file-manager/fm-directory-view.c:7794
 msgid "You can download it or make a link to it."
 msgstr "Du kan hämta den eller skapa en länk till den."
 
-#: ../src/file-manager/fm-directory-view.c:8347
+#: src/file-manager/fm-directory-view.c:7797
 msgid "Make a _Link"
 msgstr "Skapa en _länk"
 
-#: ../src/file-manager/fm-directory-view.c:8351
+#: src/file-manager/fm-directory-view.c:7801
 msgid "_Download"
 msgstr "_Hämta"
 
-#: ../src/file-manager/fm-directory-view.c:8410
-#: ../src/file-manager/fm-directory-view.c:8463
-#: ../src/file-manager/fm-directory-view.c:8561
+#: src/file-manager/fm-directory-view.c:7858
+#: src/file-manager/fm-directory-view.c:7880
+#: src/file-manager/fm-directory-view.c:7994
 msgid "Drag and drop is not supported."
 msgstr "Dra och släpp stöds inte."
 
-#: ../src/file-manager/fm-directory-view.c:8411
+#: src/file-manager/fm-directory-view.c:7859
 msgid "Drag and drop is only supported on local file systems."
 msgstr "Dra och släpp stöds endast på lokala filsystem."
 
-#: ../src/file-manager/fm-directory-view.c:8412
-#: ../src/file-manager/fm-directory-view.c:8465
-#: ../src/file-manager/fm-directory-view.c:8563
+#: src/file-manager/fm-directory-view.c:7860
+#: src/file-manager/fm-directory-view.c:7882
+#: src/file-manager/fm-directory-view.c:7996
 msgid "Drag and Drop Error"
 msgstr "Fel med dra och släpp"
 
-#: ../src/file-manager/fm-directory-view.c:8464
-#: ../src/file-manager/fm-directory-view.c:8562
+#: src/file-manager/fm-directory-view.c:7881
+#: src/file-manager/fm-directory-view.c:7995
 msgid "An invalid drag type was used."
 msgstr "En ogiltig dragtyp användes."
 
-#: ../src/file-manager/fm-ditem-page.c:337
-#: ../src/file-manager/fm-ditem-page.c:348
+#: src/file-manager/fm-ditem-page.c:337 src/file-manager/fm-ditem-page.c:348
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../src/file-manager/fm-ditem-page.c:340
+#: src/file-manager/fm-ditem-page.c:340
 msgid "URL"
 msgstr "URL"
 
-#: ../src/file-manager/fm-ditem-page.c:343
-#: ../src/file-manager/fm-ditem-page.c:354
-msgid "Description"
-msgstr "Beskrivning"
-
-#: ../src/file-manager/fm-ditem-page.c:344
+#: src/file-manager/fm-ditem-page.c:344
 msgid "Link"
 msgstr "Länk"
 
-#: ../src/file-manager/fm-ditem-page.c:351
+#: src/file-manager/fm-ditem-page.c:351
 msgid "Command"
 msgstr "Kommando"
 
-#: ../src/file-manager/fm-ditem-page.c:355
+#: src/file-manager/fm-ditem-page.c:355
 msgid "Launcher"
 msgstr "Startare"
 
-#: ../src/file-manager/fm-error-reporting.c:57
+#: src/file-manager/fm-error-reporting.c:57
 #, c-format
 msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr ""
 "Du har inte de nödvändiga rättigheterna för att se innehållet i \"%s\"."
 
-#: ../src/file-manager/fm-error-reporting.c:61
+#: src/file-manager/fm-error-reporting.c:61
 #, c-format
 msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
 msgstr "\"%s\" kunde inte hittas. Den har kanske tagits bort nyligen."
 
-#: ../src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:68
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Tyvärr, kunde inte visa allt innehåll i \"%s\"."
 
-#: ../src/file-manager/fm-error-reporting.c:71
+#: src/file-manager/fm-error-reporting.c:71
 msgid "The folder contents could not be displayed."
 msgstr "Mappinnehållet kunde inte visas."
 
-#: ../src/file-manager/fm-error-reporting.c:72
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Fel vid visning av mapp"
 
-#: ../src/file-manager/fm-error-reporting.c:103
+#: 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 "Namnet \"%s\" används redan i denna mapp. Välj ett annat namn."
 
-#: ../src/file-manager/fm-error-reporting.c:108
+#: 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\" finns inte i denna mapp. Den kanske flyttades eller togs bort precis?"
 
-#: ../src/file-manager/fm-error-reporting.c:113
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Du har inte de nödvändiga rättigheterna för att byta namn på \"%s\"."
 
-#: ../src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -3674,411 +3873,364 @@ msgstr ""
 "Namnet \"%s\" är inte giltigt eftersom det innehåller tecknet \"/\". Var "
 "vänlig och välj ett annat namn."
 
-#: ../src/file-manager/fm-error-reporting.c:122
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Namnet \"%s\" är inte giltigt. Välj ett annat namn."
 
-#: ../src/file-manager/fm-error-reporting.c:128
+#: 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 ""
 "Kunde inte byta namn på \"%s\" eftersom den finns på en skrivskyddad disk"
 
-#: ../src/file-manager/fm-error-reporting.c:137
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Tyvärr, kunde inte byta namn på \"%s\" till \"%s\"."
 
-#: ../src/file-manager/fm-error-reporting.c:144
+#: src/file-manager/fm-error-reporting.c:144
 msgid "The item could not be renamed."
 msgstr "Objektets namn kunde inte bytas."
 
-#: ../src/file-manager/fm-error-reporting.c:145
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Namnbytesfel"
 
-#: ../src/file-manager/fm-error-reporting.c:165
+#: src/file-manager/fm-error-reporting.c:165
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Du har inte de nödvändiga rättigheterna för att byta grupp på \"%s\"."
 
-#: ../src/file-manager/fm-error-reporting.c:169
+#: src/file-manager/fm-error-reporting.c:169
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kunde inte byta grupp på \"%s\" eftersom den finns på en skrivskyddad disk"
 
-#: ../src/file-manager/fm-error-reporting.c:177
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Tyvärr, kunde inte byta grupp på \"%s\"."
 
-#: ../src/file-manager/fm-error-reporting.c:181
+#: src/file-manager/fm-error-reporting.c:181
 msgid "The group could not be changed."
 msgstr "Gruppen kunde inte bytas."
 
-#: ../src/file-manager/fm-error-reporting.c:181
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Fel vid specificering av grupp"
 
-#: ../src/file-manager/fm-error-reporting.c:203
+#: src/file-manager/fm-error-reporting.c:203
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kunde inte byta ägare på \"%s\" eftersom den finns på en skrivskyddad disk"
 
-#: ../src/file-manager/fm-error-reporting.c:210
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Tyvärr, kunde inte byta ägaren på \"%s\"."
 
-#: ../src/file-manager/fm-error-reporting.c:213
+#: src/file-manager/fm-error-reporting.c:213
 msgid "The owner could not be changed."
 msgstr "Ägaren kunde inte bytas."
 
-#: ../src/file-manager/fm-error-reporting.c:213
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Fel vid specificering av ägare"
 
-#: ../src/file-manager/fm-error-reporting.c:235
+#: src/file-manager/fm-error-reporting.c:235
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kunde inte byta ägare på \"%s\" eftersom den är på en skrivskyddad disk"
 
-#: ../src/file-manager/fm-error-reporting.c:242
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Tyvärr, kunde inte ändra rättigheterna på \"%s.\"."
 
-#: ../src/file-manager/fm-error-reporting.c:245
+#: src/file-manager/fm-error-reporting.c:245
 msgid "The permissions could not be changed."
 msgstr "Rättigheterna kunde inte ändras."
 
-#: ../src/file-manager/fm-error-reporting.c:246
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Fel vid specificering av rättigheter"
 
-#: ../src/file-manager/fm-error-reporting.c:312
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Byter namn på \"%s\" till \"%s\"."
 
-#: ../src/file-manager/fm-error-reporting.c:317
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Avbryt namnbyte?"
 
-#: ../src/file-manager/fm-icon-view.c:134
+#: src/file-manager/fm-icon-view.c:134
 msgid "by _Name"
 msgstr "efter _namn"
 
-#: ../src/file-manager/fm-icon-view.c:135
-#: ../src/file-manager/fm-icon-view.c:1437
+#: src/file-manager/fm-icon-view.c:135 src/file-manager/fm-icon-view.c:1431
 msgid "Keep icons sorted by name in rows"
 msgstr "Sortera ikoner i rader efter namn"
 
-#: ../src/file-manager/fm-icon-view.c:141
+#: src/file-manager/fm-icon-view.c:141
 msgid "by _Size"
 msgstr "efter _storlek"
 
-#: ../src/file-manager/fm-icon-view.c:142
-#: ../src/file-manager/fm-icon-view.c:1441
+#: src/file-manager/fm-icon-view.c:142 src/file-manager/fm-icon-view.c:1435
 msgid "Keep icons sorted by size in rows"
 msgstr "Sortera ikoner i rader efter storlek"
 
-#: ../src/file-manager/fm-icon-view.c:148
+#: src/file-manager/fm-icon-view.c:148
 msgid "by _Type"
 msgstr "efter _typ"
 
-#: ../src/file-manager/fm-icon-view.c:149
-#: ../src/file-manager/fm-icon-view.c:1445
+#: src/file-manager/fm-icon-view.c:149 src/file-manager/fm-icon-view.c:1439
 msgid "Keep icons sorted by type in rows"
 msgstr "Sortera ikoner i rader efter typ"
 
-#: ../src/file-manager/fm-icon-view.c:155
+#: src/file-manager/fm-icon-view.c:155
 msgid "by Modification _Date"
 msgstr "efter ändrings_datum"
 
-#: ../src/file-manager/fm-icon-view.c:156
-#: ../src/file-manager/fm-icon-view.c:1449
+#: src/file-manager/fm-icon-view.c:156 src/file-manager/fm-icon-view.c:1443
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Sortera ikoner i rader efter ändringsdatum"
 
-#: ../src/file-manager/fm-icon-view.c:162
+#: src/file-manager/fm-icon-view.c:162
 msgid "by _Emblems"
 msgstr "efter _emblem"
 
-#: ../src/file-manager/fm-icon-view.c:163
-#: ../src/file-manager/fm-icon-view.c:1453
+#: src/file-manager/fm-icon-view.c:163 src/file-manager/fm-icon-view.c:1447
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Sortera ikoner i rader efter emblem"
 
-#: ../src/file-manager/fm-icon-view.c:1397
+#: src/file-manager/fm-icon-view.c:1391
 msgid "Arran_ge Items"
 msgstr "_Ordna objekt"
 
 #. name, stock id, label
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1399
+#: src/file-manager/fm-icon-view.c:1393
 msgid "Str_etch Icon"
 msgstr "Str_äck ut ikon"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1400
+#: src/file-manager/fm-icon-view.c:1394
 msgid "Make the selected icon stretchable"
 msgstr "Gör den markerade ikonen uttänjningsbar"
 
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1403
-#: ../src/file-manager/fm-icon-view.c:1554
+#: src/file-manager/fm-icon-view.c:1397 src/file-manager/fm-icon-view.c:1548
 msgid "Restore Icons' Original Si_zes"
 msgstr "_Återställ ikonernas originalstorlekar"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1404
+#: src/file-manager/fm-icon-view.c:1398
 msgid "Restore each selected icon to its original size"
 msgstr "Återställ varje markerad ikon till dess originalstorlek"
 
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1407
+#: src/file-manager/fm-icon-view.c:1401
 msgid "Clean _Up by Name"
 msgstr "St_äda upp efter namn"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1408
+#: src/file-manager/fm-icon-view.c:1402
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 "Positionera om ikonerna så att de passar bättre i fönstret och så att "
 "överlappning undviks"
 
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1414
+#: src/file-manager/fm-icon-view.c:1408
 msgid "Compact _Layout"
 msgstr "Kompakt _layout"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1415
+#: src/file-manager/fm-icon-view.c:1409
 msgid "Toggle using a tighter layout scheme"
 msgstr "Växla användandet av ett kompaktare layoutschema"
 
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1419
+#: src/file-manager/fm-icon-view.c:1413
 msgid "Re_versed Order"
 msgstr "_Omvänd ordning"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1420
+#: src/file-manager/fm-icon-view.c:1414
 msgid "Display icons in the opposite order"
 msgstr "Visa ikoner i omvänd ordning"
 
 #. name, stock id
-#: ../src/file-manager/fm-icon-view.c:1424
+#: src/file-manager/fm-icon-view.c:1418
 msgid "_Keep Aligned"
 msgstr "_Behåll justerat"
 
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1425
+#: src/file-manager/fm-icon-view.c:1419
 msgid "Keep icons lined up on a grid"
 msgstr "Behåll ikoner ordnade radvis utefter ett rutnät"
 
-#: ../src/file-manager/fm-icon-view.c:1432
+#: src/file-manager/fm-icon-view.c:1426
 msgid "_Manually"
 msgstr "_Manuellt"
 
-#: ../src/file-manager/fm-icon-view.c:1433
+#: src/file-manager/fm-icon-view.c:1427
 msgid "Leave icons wherever they are dropped"
 msgstr "Lämna ikoner där de släpps"
 
-#: ../src/file-manager/fm-icon-view.c:1436
+#: src/file-manager/fm-icon-view.c:1430
 msgid "By _Name"
 msgstr "Efter _namn"
 
-#: ../src/file-manager/fm-icon-view.c:1440
+#: src/file-manager/fm-icon-view.c:1434
 msgid "By _Size"
 msgstr "Efter _storlek"
 
-#: ../src/file-manager/fm-icon-view.c:1444
+#: src/file-manager/fm-icon-view.c:1438
 msgid "By _Type"
 msgstr "Efter _typ"
 
-#: ../src/file-manager/fm-icon-view.c:1448
+#: src/file-manager/fm-icon-view.c:1442
 msgid "By Modification _Date"
 msgstr "Efter ändrings_datum"
 
-#: ../src/file-manager/fm-icon-view.c:1452
+#: src/file-manager/fm-icon-view.c:1446
 msgid "By _Emblems"
 msgstr "Efter _emblem"
 
-#: ../src/file-manager/fm-icon-view.c:1555
+#: src/file-manager/fm-icon-view.c:1549
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Återställ ikonens originalstorlek"
 
-#: ../src/file-manager/fm-icon-view.c:1956
+#: src/file-manager/fm-icon-view.c:1910
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pekar på \"%s\""
 
-#: ../src/file-manager/fm-icon-view.c:2730
+#: src/file-manager/fm-icon-view.c:2673
 msgid "Icons"
 msgstr "Ikoner"
 
-#: ../src/file-manager/fm-icon-view.c:2731
-msgid "View as Icons"
-msgstr "Visa som ikoner"
+#: src/file-manager/fm-icon-view.c:2674
+msgid "_Icons"
+msgstr "_Ikoner"
 
-#: ../src/file-manager/fm-icon-view.c:2732
-msgid "View as _Icons"
-msgstr "Visa som _ikoner"
-
-#: ../src/file-manager/fm-icon-view.c:2733
-msgid "The icon view encountered an error."
-msgstr "Ikonvyn råkade ut för ett fel."
-
-#: ../src/file-manager/fm-icon-view.c:2734
-msgid "The icon view encountered an error while starting up."
-msgstr "Ikonvyn råkade ut för ett fel vid uppstarten."
-
-#: ../src/file-manager/fm-icon-view.c:2735
-msgid "Display this location with the icon view."
-msgstr "Visa denna plats med ikonvyn."
-
-#: ../src/file-manager/fm-list-model.c:363
-#: ../src/file-manager/fm-tree-model.c:1212
-msgid "(Empty)"
-msgstr "(Tomt)"
-
-#: ../src/file-manager/fm-list-model.c:365
-#: ../src/file-manager/fm-tree-model.c:1212
-msgid "Loading..."
-msgstr "Läser in..."
-
-#: ../src/file-manager/fm-list-view.c:1986
+#: src/file-manager/fm-list-view.c:1599
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s synliga kolumner"
 
-#: ../src/file-manager/fm-list-view.c:2005
+#: src/file-manager/fm-list-view.c:1618
 msgid "Choose the order of information to appear in this folder."
 msgstr "Välj i vilken ordning informationen ska visas i denna mapp."
 
 #. name, stock id
-#: ../src/file-manager/fm-list-view.c:2047
+#: src/file-manager/fm-list-view.c:1660
 msgid "Visible _Columns..."
 msgstr "Synliga _kolumner..."
 
 #. label, accelerator
-#: ../src/file-manager/fm-list-view.c:2048
+#: src/file-manager/fm-list-view.c:1661
 msgid "Select the columns visible in this folder"
 msgstr "Välj de kolumner som ska vara synliga i denna mapp"
 
-#: ../src/file-manager/fm-list-view.c:2732
+#: src/file-manager/fm-list-view.c:2311
 msgid "List"
 msgstr "Lista"
 
-#: ../src/file-manager/fm-list-view.c:2733
-msgid "View as List"
-msgstr "Visa som lista"
-
-#: ../src/file-manager/fm-list-view.c:2734
-msgid "View as _List"
-msgstr "Visa som _lista"
-
-#: ../src/file-manager/fm-list-view.c:2735
-msgid "The list view encountered an error."
-msgstr "Listvyn råkade ut för ett fel."
+#: src/file-manager/fm-list-view.c:2312
+msgid "_List"
+msgstr "_Lista"
 
-#: ../src/file-manager/fm-list-view.c:2736
-msgid "The list view encountered an error while starting up."
-msgstr "Listvyn råkade ut för ett fel vid uppstarten."
-
-#: ../src/file-manager/fm-list-view.c:2737
-msgid "Display this location with the list view."
-msgstr "Visa denna plats med listvyn."
-
-#: ../src/file-manager/fm-properties-window.c:512
+#: src/file-manager/fm-properties-window.c:484
 msgid "You can't assign more than one custom icon at a time!"
 msgstr "Du kan inte tilldela mer än en anpassad ikon åt gången!"
 
-#: ../src/file-manager/fm-properties-window.c:513
-#: ../src/nautilus-information-panel.c:555
+#: src/file-manager/fm-properties-window.c:485
+#: src/nautilus-information-panel.c:548
 msgid "Please drag just one image to set a custom icon."
 msgstr "Dra endast en bild för att ställa in en anpassad ikon."
 
-#: ../src/file-manager/fm-properties-window.c:514
-#: ../src/nautilus-information-panel.c:556
+#: src/file-manager/fm-properties-window.c:486
+#: src/nautilus-information-panel.c:549
 msgid "More Than One Image"
 msgstr "Fler än en bild"
 
-#: ../src/file-manager/fm-properties-window.c:523
-#: ../src/nautilus-information-panel.c:575
+#: src/file-manager/fm-properties-window.c:495
+#: src/nautilus-information-panel.c:568
 msgid "The file that you dropped is not local."
 msgstr "Filen som du släppte är inte lokal."
 
-#: ../src/file-manager/fm-properties-window.c:524
-#: ../src/file-manager/fm-properties-window.c:531
-#: ../src/nautilus-information-panel.c:576
+#: src/file-manager/fm-properties-window.c:496
+#: src/file-manager/fm-properties-window.c:503
+#: src/nautilus-information-panel.c:569
 msgid "You can only use local images as custom icons."
 msgstr "Du kan endast använda lokala bilder som anpassade ikoner."
 
-#: ../src/file-manager/fm-properties-window.c:525
-#: ../src/nautilus-information-panel.c:577
+#: src/file-manager/fm-properties-window.c:497
+#: src/nautilus-information-panel.c:570
 msgid "Local Images Only"
 msgstr "Endast lokala bilder"
 
-#: ../src/file-manager/fm-properties-window.c:530
-#: ../src/nautilus-information-panel.c:582
+#: src/file-manager/fm-properties-window.c:502
+#: src/nautilus-information-panel.c:575
 msgid "The file that you dropped is not an image."
 msgstr "Filen som du släppte är inte en bild."
 
-#: ../src/file-manager/fm-properties-window.c:532
-#: ../src/nautilus-information-panel.c:584
+#: src/file-manager/fm-properties-window.c:504
+#: src/nautilus-information-panel.c:577
 msgid "Images Only"
 msgstr "Endast bilder"
 
-#: ../src/file-manager/fm-properties-window.c:1015
+#: src/file-manager/fm-properties-window.c:929
+#: src/file-manager/fm-tree-view.c:1203
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../src/file-manager/fm-properties-window.c:1023
+#: src/file-manager/fm-properties-window.c:937
 #, c-format
 msgid "%s Properties"
 msgstr "Egenskaper för %s"
 
-#: ../src/file-manager/fm-properties-window.c:1537
+#: src/file-manager/fm-properties-window.c:1451
 msgid "Cancel Group Change?"
 msgstr "Avbryt byte av grupp?"
 
-#: ../src/file-manager/fm-properties-window.c:1538
+#: src/file-manager/fm-properties-window.c:1452
 msgid "Changing group."
 msgstr "Byter grupp."
 
-#: ../src/file-manager/fm-properties-window.c:1699
+#: src/file-manager/fm-properties-window.c:1613
 msgid "Cancel Owner Change?"
 msgstr "Avbryt byte av ägare?"
 
-#: ../src/file-manager/fm-properties-window.c:1700
+#: src/file-manager/fm-properties-window.c:1614
 msgid "Changing owner."
 msgstr "Byter ägare."
 
-#: ../src/file-manager/fm-properties-window.c:1906
+#: src/file-manager/fm-properties-window.c:1820
 msgid "nothing"
 msgstr "ingenting"
 
-#: ../src/file-manager/fm-properties-window.c:1908
+#: src/file-manager/fm-properties-window.c:1822
 msgid "unreadable"
 msgstr "oläsbar"
 
-#: ../src/file-manager/fm-properties-window.c:1918
+#: src/file-manager/fm-properties-window.c:1832
 #, c-format
 msgid "%d item, with size %s"
 msgid_plural "%d items, totalling %s"
 msgstr[0] "%d objekt, med storleken %s"
 msgstr[1] "%d objekt, med totalt %s"
 
-#: ../src/file-manager/fm-properties-window.c:1927
+#: src/file-manager/fm-properties-window.c:1841
 msgid "(some contents unreadable)"
 msgstr "(en del innehåll är oläsbart)"
 
@@ -4088,233 +4240,252 @@ msgstr "(en del innehåll är oläsbart)"
 #. * 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:1944
+#: src/file-manager/fm-properties-window.c:1858
 msgid "Contents:"
 msgstr "Innehåll:"
 
-#: ../src/file-manager/fm-properties-window.c:2329
+#: src/file-manager/fm-properties-window.c:2244
 msgid "Basic"
 msgstr "Grundläggande"
 
-#. Name label
-#: ../src/file-manager/fm-properties-window.c:2357
+#: src/file-manager/fm-properties-window.c:2272
+msgid "_Names:"
+msgstr "_Namn:"
+
+#: src/file-manager/fm-properties-window.c:2274
 msgid "_Name:"
-msgid_plural "_Names:"
-msgstr[0] "_Namn:"
-msgstr[1] "_Namn:"
+msgstr "_Namn:"
 
-#: ../src/file-manager/fm-properties-window.c:2376
+#: src/file-manager/fm-properties-window.c:2323
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/file-manager/fm-properties-window.c:2378
-#: ../src/file-manager/fm-properties-window.c:2388
-#: ../src/file-manager/fm-properties-window.c:2394
-#: ../src/file-manager/fm-properties-window.c:2401
-#: ../src/file-manager/fm-properties-window.c:2405
-#: ../src/file-manager/fm-properties-window.c:2413
-#: ../src/file-manager/fm-properties-window.c:2419
-#: ../src/file-manager/fm-properties-window.c:2428
-#: ../src/file-manager/fm-properties-window.c:2434
-#: ../src/file-manager/fm-properties-window.c:3027
-#: ../src/file-manager/fm-properties-window.c:3048
-#: ../src/file-manager/fm-properties-window.c:3139
-#: ../src/file-manager/fm-properties-window.c:3143
-#: ../src/file-manager/fm-properties-window.c:3147
+#: src/file-manager/fm-properties-window.c:2325
+#: src/file-manager/fm-properties-window.c:2335
+#: src/file-manager/fm-properties-window.c:2341
+#: src/file-manager/fm-properties-window.c:2348
+#: src/file-manager/fm-properties-window.c:2352
+#: src/file-manager/fm-properties-window.c:2360
+#: src/file-manager/fm-properties-window.c:2366
+#: src/file-manager/fm-properties-window.c:2375
+#: src/file-manager/fm-properties-window.c:2381
+#: src/file-manager/fm-properties-window.c:2974
+#: src/file-manager/fm-properties-window.c:2995
+#: src/file-manager/fm-properties-window.c:3086
+#: src/file-manager/fm-properties-window.c:3090
+#: src/file-manager/fm-properties-window.c:3094
 msgid "--"
 msgstr "--"
 
-#: ../src/file-manager/fm-properties-window.c:2386
+#: src/file-manager/fm-properties-window.c:2333
 msgid "Size:"
 msgstr "Storlek:"
 
-#: ../src/file-manager/fm-properties-window.c:2392
-#: ../src/nautilus-location-bar.c:60
+#: src/file-manager/fm-properties-window.c:2339 src/nautilus-location-bar.c:60
 msgid "Location:"
 msgstr "Plats:"
 
-#: ../src/file-manager/fm-properties-window.c:2399
+#: src/file-manager/fm-properties-window.c:2346
 msgid "Volume:"
 msgstr "Volym:"
 
-#: ../src/file-manager/fm-properties-window.c:2403
+#: src/file-manager/fm-properties-window.c:2350
 msgid "Free space:"
 msgstr "Ledigt utrymme:"
 
-#: ../src/file-manager/fm-properties-window.c:2411
+#: src/file-manager/fm-properties-window.c:2358
 msgid "Link target:"
 msgstr "Länkmål:"
 
-#: ../src/file-manager/fm-properties-window.c:2417
+#: src/file-manager/fm-properties-window.c:2364
 msgid "MIME type:"
 msgstr "MIME-typ:"
 
-#: ../src/file-manager/fm-properties-window.c:2426
+#: src/file-manager/fm-properties-window.c:2373
 msgid "Modified:"
 msgstr "Ändrad:"
 
-#: ../src/file-manager/fm-properties-window.c:2432
+#: src/file-manager/fm-properties-window.c:2379
 msgid "Accessed:"
 msgstr "Ã…tkommen:"
 
-#: ../src/file-manager/fm-properties-window.c:2448
+#: src/file-manager/fm-properties-window.c:2395
 msgid "_Select Custom Icon..."
 msgstr "_Välj anpassad ikon..."
 
-#: ../src/file-manager/fm-properties-window.c:2454
+#: src/file-manager/fm-properties-window.c:2401
 msgid "_Remove Custom Icon"
 msgstr "_Ta bort anpassad ikon"
 
-#: ../src/file-manager/fm-properties-window.c:2521
-#: ../src/nautilus-emblem-sidebar.c:1045
+#: src/file-manager/fm-properties-window.c:2468
+#: src/nautilus-emblem-sidebar.c:1045
 msgid "Emblems"
 msgstr "Emblem"
 
-#: ../src/file-manager/fm-properties-window.c:2806
+#: src/file-manager/fm-properties-window.c:2753
 msgid "_Read"
 msgstr "_Läs"
 
-#: ../src/file-manager/fm-properties-window.c:2808
+#: src/file-manager/fm-properties-window.c:2755
 msgid "_Write"
 msgstr "_Skriv"
 
-#: ../src/file-manager/fm-properties-window.c:2810
+#: src/file-manager/fm-properties-window.c:2757
 msgid "E_xecute"
 msgstr "_Kör"
 
-#: ../src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2840
 msgid "Set _user ID"
 msgstr "Ställ in _användar-ID"
 
-#: ../src/file-manager/fm-properties-window.c:2898
+#: src/file-manager/fm-properties-window.c:2845
 msgid "Special flags:"
 msgstr "Specialflaggor:"
 
-#: ../src/file-manager/fm-properties-window.c:2901
+#: src/file-manager/fm-properties-window.c:2848
 msgid "Set gro_up ID"
 msgstr "Ställ in gr_upp-ID"
 
-#: ../src/file-manager/fm-properties-window.c:2903
+#: src/file-manager/fm-properties-window.c:2850
 msgid "_Sticky"
 msgstr "_Fast"
 
-#: ../src/file-manager/fm-properties-window.c:3002
+#: src/file-manager/fm-properties-window.c:2949
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Du är inte ägaren, så du kan inte ändra dessa rättigheter."
 
-#: ../src/file-manager/fm-properties-window.c:3016
+#: src/file-manager/fm-properties-window.c:2963
 msgid "File _owner:"
 msgstr "Fil_ägare:"
 
-#: ../src/file-manager/fm-properties-window.c:3022
+#: src/file-manager/fm-properties-window.c:2969
 msgid "File owner:"
 msgstr "Filägare:"
 
-#: ../src/file-manager/fm-properties-window.c:3033
+#: src/file-manager/fm-properties-window.c:2980
 msgid "_File group:"
 msgstr "_Filgrupp:"
 
-#: ../src/file-manager/fm-properties-window.c:3042
+#: src/file-manager/fm-properties-window.c:2989
 msgid "File group:"
 msgstr "Filgrupp:"
 
-#: ../src/file-manager/fm-properties-window.c:3054
+#: src/file-manager/fm-properties-window.c:3001
 msgid "Owner:"
 msgstr "Ägare:"
 
-#: ../src/file-manager/fm-properties-window.c:3055
+#: src/file-manager/fm-properties-window.c:3002
 msgid "Group:"
 msgstr "Grupp:"
 
-#: ../src/file-manager/fm-properties-window.c:3056
+#: src/file-manager/fm-properties-window.c:3003
 msgid "Others:"
 msgstr "Andra:"
 
-#: ../src/file-manager/fm-properties-window.c:3138
+#: src/file-manager/fm-properties-window.c:3085
 msgid "Text view:"
 msgstr "Textvy:"
 
-#: ../src/file-manager/fm-properties-window.c:3142
+#: src/file-manager/fm-properties-window.c:3089
 msgid "Number view:"
 msgstr "Talvy:"
 
-#: ../src/file-manager/fm-properties-window.c:3146
+#: src/file-manager/fm-properties-window.c:3093
 msgid "Last changed:"
 msgstr "Senast ändrad:"
 
-#: ../src/file-manager/fm-properties-window.c:3152
+#: src/file-manager/fm-properties-window.c:3099
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Rättigheterna för \"%s\" kunde inte fastställas."
 
-#: ../src/file-manager/fm-properties-window.c:3155
+#: src/file-manager/fm-properties-window.c:3102
 msgid "The permissions of the selected file could not be determined."
 msgstr "Rättigheterna för den markerade filen kunde inte fastställas."
 
-#: ../src/file-manager/fm-properties-window.c:3313
+#: src/file-manager/fm-properties-window.c:3260
 msgid "There was an error displaying help."
 msgstr "Det inträffade ett fel vid visande av hjälp."
 
-#: ../src/file-manager/fm-properties-window.c:3313
+#: src/file-manager/fm-properties-window.c:3260
 msgid "Couldn't Show Help"
 msgstr "Kunde inte visa hjälp"
 
-#: ../src/file-manager/fm-properties-window.c:3370
+#: src/file-manager/fm-properties-window.c:3317
 msgid "Open With"
 msgstr "Öppna med"
 
-#: ../src/file-manager/fm-properties-window.c:3708
+#: src/file-manager/fm-properties-window.c:3655
 msgid "Cancel Showing Properties Window?"
 msgstr "Avbryt visandet av egenskapsfönstret?"
 
-#: ../src/file-manager/fm-properties-window.c:3709
+#: src/file-manager/fm-properties-window.c:3656
 msgid "Creating Properties window."
 msgstr "Skapar fönstret Egenskaper."
 
-#: ../src/file-manager/fm-properties-window.c:3866
+#: src/file-manager/fm-properties-window.c:3813
 msgid "Select an icon"
 msgstr "Välj en ikon"
 
-#: ../src/file-manager/fm-tree-view.c:750
+#: src/file-manager/fm-tree-model.c:1210
+msgid "(Empty)"
+msgstr "(Tomt)"
+
+#: src/file-manager/fm-tree-model.c:1210
+msgid "Loading..."
+msgstr "Läser in..."
+
+#: src/file-manager/fm-tree-view.c:745
 msgid "E_ject"
 msgstr "_Mata ut"
 
+#: src/file-manager/fm-tree-view.c:1099
+msgid "Open"
+msgstr "Öppna"
+
 #. add the "create folder" menu item
-#: ../src/file-manager/fm-tree-view.c:1129
+#: src/file-manager/fm-tree-view.c:1123
 msgid "Create Folder"
 msgstr "Skapa mapp"
 
-#: ../src/file-manager/fm-tree-view.c:1181
+#: src/file-manager/fm-tree-view.c:1139
+msgid "Cut Folder"
+msgstr "Klipp ut mapp"
+
+#: src/file-manager/fm-tree-view.c:1153
+msgid "Copy Folder"
+msgstr "Kopiera mapp"
+
+#: src/file-manager/fm-tree-view.c:1167
+msgid "Paste Files into Folder"
+msgstr "Klistra in filer i mapp"
+
+#: src/file-manager/fm-tree-view.c:1185
 msgid "Move to Trash"
 msgstr "Flytta till papperskorgen"
 
-#: ../src/file-manager/fm-tree-view.c:1245
-#: ../src/nautilus-places-sidebar.c:170
-msgid "File System"
+#: src/file-manager/fm-tree-view.c:1254
+msgid "Filesystem"
 msgstr "Filsystem"
 
-#: ../src/file-manager/fm-tree-view.c:1247
+#: src/file-manager/fm-tree-view.c:1256
 msgid "Network Neighbourhood"
 msgstr "Nätverket"
 
-#: ../src/file-manager/fm-tree-view.c:1488
+#: src/file-manager/fm-tree-view.c:1497
 msgid "Tree"
 msgstr "Träd"
 
-#: ../src/file-manager/fm-tree-view.c:1494
-msgid "Show Tree"
-msgstr "Visa träd"
-
-#: ../src/nautilus-application.c:257
+#: src/nautilus-application.c:253
 msgid "Couldn't Create Required Folder"
 msgstr "Kan inte skapa mapp som krävs"
 
-#: ../src/nautilus-application.c:258
+#: src/nautilus-application.c:254
 #, c-format
 msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nautilus kunde inte skapa den nödvändiga mappen \"%s\"."
 
-#: ../src/nautilus-application.c:260
+#: src/nautilus-application.c:256
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
@@ -4322,16 +4493,16 @@ msgstr ""
 "Innan du kör Nautilus bör du skapa denna mapp, eller ställa in de nödvändiga "
 "rättigheterna för att Nautilus ska kunna skapa den."
 
-#: ../src/nautilus-application.c:263
+#: src/nautilus-application.c:259
 msgid "Couldn't Create Required Folders"
 msgstr "Kan inte skapa mappar som krävs"
 
-#: ../src/nautilus-application.c:264
+#: src/nautilus-application.c:260
 #, c-format
 msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nautilus kunde inte skapa följande nödvändiga mappar: %s."
 
-#: ../src/nautilus-application.c:266
+#: src/nautilus-application.c:262
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
@@ -4339,17 +4510,17 @@ msgstr ""
 "Innan du kör Nautilus bör du skapa dessa mappar, eller ställa in de "
 "nödvändiga rättigheterna för att Nautilus ska kunna skapa dem."
 
-#: ../src/nautilus-application.c:334
+#: src/nautilus-application.c:330
 msgid "Link To Old Desktop"
 msgstr "Länk till gammalt skrivbord"
 
-#: ../src/nautilus-application.c:350
+#: src/nautilus-application.c:346
 msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
 msgstr ""
 "En länk med namnet \"Länk till gammalt skrivbord\" har skapats på "
 "skrivbordet."
 
-#: ../src/nautilus-application.c:351
+#: src/nautilus-application.c:347
 msgid ""
 "The location of the desktop directory has changed in GNOME 2.4. You can open "
 "the link and move over the files you want, then delete the link."
@@ -4357,7 +4528,7 @@ msgstr ""
 "Platsen för skrivbordskatalogen har ändrats i GNOME 2.4. Du kan öppna länken "
 "för att flytta över de filer du vill ha och sedan ta bort länken."
 
-#: ../src/nautilus-application.c:353
+#: src/nautilus-application.c:349
 msgid "Migrated Old Desktop"
 msgstr "Migrerat gammalt skrivbord"
 
@@ -4371,7 +4542,7 @@ msgstr "Migrerat gammalt skrivbord"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: ../src/nautilus-application.c:511
+#: src/nautilus-application.c:510
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -4382,7 +4553,7 @@ msgstr ""
 "eller installera om Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: ../src/nautilus-application.c:517
+#: src/nautilus-application.c:516
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -4429,12 +4600,12 @@ msgstr ""
 #. * good message.
 #.
 #. FIXME bugzilla.gnome.org 42538: When can this happen?
-#: ../src/nautilus-application.c:547 ../src/nautilus-application.c:565
-#: ../src/nautilus-application.c:572
+#: src/nautilus-application.c:546 src/nautilus-application.c:564
+#: src/nautilus-application.c:571
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus kan inte användas just nu på grund av ett oväntat fel."
 
-#: ../src/nautilus-application.c:548
+#: src/nautilus-application.c:547
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -4442,7 +4613,7 @@ msgstr ""
 "Nautilus kan inte användas just nu på grund av ett oväntat fel från Bonobo "
 "inträffade när ett försök gjordes att registrera filhanterarens vyserver."
 
-#: ../src/nautilus-application.c:566
+#: src/nautilus-application.c:565
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the factory.Killing bonobo-activation-server and "
@@ -4452,7 +4623,7 @@ msgstr ""
 "när den skulle hitta fabriken. Om du dödar bonobo-activation-server och "
 "startar om Nautilus kanske problemet löser sig."
 
-#: ../src/nautilus-application.c:573
+#: src/nautilus-application.c:572
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the shell object. Killing bonobo-activation-server and "
@@ -4462,9 +4633,9 @@ msgstr ""
 "när den skulle hitta skalobjektet. Om du dödar bonobo-activation-server och "
 "startar om Nautilus kanske problemet löser sig."
 
-#: ../src/nautilus-bookmarks-window.c:157
-#: ../src/nautilus-file-management-properties.c:229
-#: ../src/nautilus-property-browser.c:1525 ../src/nautilus-window-menus.c:507
+#: src/nautilus-bookmarks-window.c:154
+#: src/nautilus-file-management-properties.c:229
+#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:502
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -4473,167 +4644,176 @@ msgstr ""
 "Det inträffade ett fel vid visande av hjälp: \n"
 "%s"
 
-#: ../src/nautilus-bookmarks-window.c:191
+#: src/nautilus-bookmarks-window.c:188
 msgid "No bookmarks defined"
 msgstr "Inga bokmärken angivna"
 
-#: ../src/nautilus-bookmarks-window.glade.h:1
+#: src/nautilus-bookmarks-window.glade.h:1
 msgid "<b>_Bookmarks</b>"
 msgstr "<b>_Bokmärken</b>"
 
-#: ../src/nautilus-bookmarks-window.glade.h:2
+#: src/nautilus-bookmarks-window.glade.h:2
 msgid "<b>_Location</b>"
 msgstr "<b>_Plats</b>"
 
-#: ../src/nautilus-bookmarks-window.glade.h:3
+#: src/nautilus-bookmarks-window.glade.h:3
 msgid "<b>_Name</b>"
 msgstr "<b>_Namn</b>"
 
-#: ../src/nautilus-bookmarks-window.glade.h:4
+#: src/nautilus-bookmarks-window.glade.h:4
 msgid "Edit Bookmarks"
 msgstr "Redigera bokmärken"
 
-#: ../src/nautilus-connect-server-dialog-main.c:67
+#: src/nautilus-connect-server-dialog-main.c:66
 #, c-format
 msgid "Can't display location \"%s\""
 msgstr "Kan inte visa platsen \"%s\""
 
-#: ../src/nautilus-connect-server-dialog.c:145
-#: ../src/nautilus-connect-server-dialog.c:160
+#: src/nautilus-connect-server-dialog.c:143
+#: src/nautilus-connect-server-dialog.c:158
 msgid "Can't Connect to Server"
 msgstr "Kan inte ansluta till servern"
 
-#: ../src/nautilus-connect-server-dialog.c:158
+#: src/nautilus-connect-server-dialog.c:156
 msgid "You must enter a name for the server."
 msgstr "Du måste ange namnet på servern."
 
-#: ../src/nautilus-connect-server-dialog.c:159
+#: src/nautilus-connect-server-dialog.c:157
 msgid "Please enter a name and try again."
 msgstr "Ange ett namn och försök igen."
 
-#: ../src/nautilus-connect-server-dialog.c:410
+#: src/nautilus-connect-server-dialog.c:269 src/nautilus-window.c:981
+#, c-format
+msgid "%s on %s"
+msgstr "%s på %s"
+
+#: src/nautilus-connect-server-dialog.c:388
 msgid "_Location (URI):"
 msgstr "_Plats (URI):"
 
-#: ../src/nautilus-connect-server-dialog.c:457
+#: src/nautilus-connect-server-dialog.c:432
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/nautilus-connect-server-dialog.c:476
+#: src/nautilus-connect-server-dialog.c:451
 msgid "Optional information:"
 msgstr "Valfri information:"
 
-#: ../src/nautilus-connect-server-dialog.c:488
+#: src/nautilus-connect-server-dialog.c:463
 msgid "_Share:"
 msgstr "_Utdelning:"
 
-#: ../src/nautilus-connect-server-dialog.c:509
+#: src/nautilus-connect-server-dialog.c:484
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/nautilus-connect-server-dialog.c:529
+#: src/nautilus-connect-server-dialog.c:504
 msgid "_Folder:"
 msgstr "_Mapp:"
 
-#: ../src/nautilus-connect-server-dialog.c:549
+#: src/nautilus-connect-server-dialog.c:524
 msgid "_User Name:"
 msgstr "_Användarnamn:"
 
-#: ../src/nautilus-connect-server-dialog.c:570
-msgid "_Domain Name:"
-msgstr "_Domännamn:"
-
-#: ../src/nautilus-connect-server-dialog.c:594
+#: src/nautilus-connect-server-dialog.c:547
 msgid "_Name to use for connection:"
 msgstr "_Namn att använda på anslutningen:"
 
-#: ../src/nautilus-connect-server-dialog.c:652
+#: src/nautilus-connect-server-dialog.c:605
 msgid "Connect to Server"
 msgstr "Anslut till server"
 
-#: ../src/nautilus-connect-server-dialog.c:669
+#: src/nautilus-connect-server-dialog.c:622
 msgid "Service _type:"
 msgstr "_Typ av tjänst:"
 
-#: ../src/nautilus-connect-server-dialog.c:678
+#: src/nautilus-connect-server-dialog.c:631
 msgid "SSH"
 msgstr "SSH"
 
-#: ../src/nautilus-connect-server-dialog.c:680
+#: src/nautilus-connect-server-dialog.c:633
 msgid "Public FTP"
 msgstr "Publik FTP"
 
-#: ../src/nautilus-connect-server-dialog.c:682
+#: src/nautilus-connect-server-dialog.c:635
 msgid "FTP (with login)"
 msgstr "FTP (med inloggning)"
 
-#: ../src/nautilus-connect-server-dialog.c:684
+#: src/nautilus-connect-server-dialog.c:637
 msgid "Windows share"
 msgstr "Windows-utdelning"
 
-#: ../src/nautilus-connect-server-dialog.c:686
+#: src/nautilus-connect-server-dialog.c:639
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../src/nautilus-connect-server-dialog.c:688
+#: src/nautilus-connect-server-dialog.c:641
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Säker WebDAV (HTTPS)"
 
-#: ../src/nautilus-connect-server-dialog.c:690
+#: src/nautilus-connect-server-dialog.c:643
 msgid "Custom Location"
 msgstr "Anpassad plats"
 
-#: ../src/nautilus-connect-server-dialog.c:742
+#: src/nautilus-connect-server-dialog.c:693
 msgid "Browse _Network"
 msgstr "Bläddra i _nätverket"
 
-#: ../src/nautilus-connect-server-dialog.c:748
+#: src/nautilus-connect-server-dialog.c:699
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: ../src/nautilus-emblem-sidebar.c:241
+#: src/nautilus-emblem-sidebar.c:241
 #, c-format
 msgid "Couldn't remove emblem with name '%s'."
 msgstr "Kunde inte ta bort emblemet med namnet \"%s\"."
 
-#: ../src/nautilus-emblem-sidebar.c:242 ../src/nautilus-emblem-sidebar.c:277
+#: src/nautilus-emblem-sidebar.c:242
 msgid ""
-"This is probably because the emblem is a permanent one, and not one that you "
+"This is probably because the emblem is a permanent one, and not one you "
 "added yourself."
 msgstr ""
 "Detta beror troligtvis på att emblemet är permanent och inte något du lade "
 "till själv."
 
-#: ../src/nautilus-emblem-sidebar.c:243
+#: src/nautilus-emblem-sidebar.c:243
 msgid "Couldn't Remove Emblem"
 msgstr "Kunde inte ta bort emblem"
 
-#: ../src/nautilus-emblem-sidebar.c:276
+#: src/nautilus-emblem-sidebar.c:276
 #, c-format
 msgid "Couldn't rename emblem with name '%s'."
 msgstr "Kunde inte byta namn på emblemet med namnet \"%s\"."
 
-#: ../src/nautilus-emblem-sidebar.c:278
+#: src/nautilus-emblem-sidebar.c:277
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr ""
+"Detta beror troligtvis på att emblemet är permanent och inte något du lade "
+"till själv."
+
+#: src/nautilus-emblem-sidebar.c:278
 msgid "Couldn't Rename Emblem"
 msgstr "Kunde inte byta namn på emblem"
 
-#: ../src/nautilus-emblem-sidebar.c:297
+#: src/nautilus-emblem-sidebar.c:297
 msgid "Rename Emblem"
 msgstr "Byt namn på emblem"
 
-#: ../src/nautilus-emblem-sidebar.c:316
+#: src/nautilus-emblem-sidebar.c:316
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Ange ett nytt namn för det visade emblemet:"
 
-#: ../src/nautilus-emblem-sidebar.c:370
+#: src/nautilus-emblem-sidebar.c:370
 msgid "Rename"
 msgstr "Byt namn"
 
-#: ../src/nautilus-emblem-sidebar.c:542
+#: src/nautilus-emblem-sidebar.c:542
 msgid "Add Emblems..."
 msgstr "Lägg till emblem..."
 
-#: ../src/nautilus-emblem-sidebar.c:558
+#: src/nautilus-emblem-sidebar.c:558
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -4641,7 +4821,7 @@ msgstr ""
 "Ange ett beskrivande namn bredvid varje emblem. Detta namn kommer att "
 "användas på andra ställen för att identifiera emblemet."
 
-#: ../src/nautilus-emblem-sidebar.c:560
+#: src/nautilus-emblem-sidebar.c:560
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -4649,142 +4829,138 @@ msgstr ""
 "Ange ett beskrivande namn bredvid emblemet. Detta namn kommer att användas "
 "på andra ställen för att identifiera emblemet."
 
-#: ../src/nautilus-emblem-sidebar.c:779
+#: src/nautilus-emblem-sidebar.c:779
 msgid "Some of the files could not be added as emblems."
 msgstr "En del av filerna kunde inte läggas till som emblem."
 
-#: ../src/nautilus-emblem-sidebar.c:779 ../src/nautilus-emblem-sidebar.c:781
+#: src/nautilus-emblem-sidebar.c:779 src/nautilus-emblem-sidebar.c:781
 msgid "The emblems do not appear to be valid images."
 msgstr "Emblemen verkar inte vara giltiga bilder."
 
-#: ../src/nautilus-emblem-sidebar.c:779 ../src/nautilus-emblem-sidebar.c:781
+#: src/nautilus-emblem-sidebar.c:779 src/nautilus-emblem-sidebar.c:781
 msgid "Couldn't Add Emblems"
 msgstr "Kunde inte lägga till emblem"
 
-#: ../src/nautilus-emblem-sidebar.c:781
+#: src/nautilus-emblem-sidebar.c:781
 msgid "None of the files could be added as emblems."
 msgstr "En del av filerna kunde läggas till som emblem."
 
-#: ../src/nautilus-emblem-sidebar.c:802 ../src/nautilus-emblem-sidebar.c:827
-#: ../src/nautilus-emblem-sidebar.c:877
+#: src/nautilus-emblem-sidebar.c:802 src/nautilus-emblem-sidebar.c:827
+#: src/nautilus-emblem-sidebar.c:877
 msgid "The emblem cannot be added."
 msgstr "Emblemet kan inte läggas till."
 
-#: ../src/nautilus-emblem-sidebar.c:802
+#: src/nautilus-emblem-sidebar.c:802
 msgid "The dragged text was not a valid file location."
 msgstr "Den dragna texten var ingen giltig filplats."
 
-#: ../src/nautilus-emblem-sidebar.c:802 ../src/nautilus-emblem-sidebar.c:827
-#: ../src/nautilus-emblem-sidebar.c:877
+#: src/nautilus-emblem-sidebar.c:802 src/nautilus-emblem-sidebar.c:827
+#: src/nautilus-emblem-sidebar.c:877
 msgid "Couldn't Add Emblem"
 msgstr "Kunde inte lägga till emblem"
 
-#: ../src/nautilus-emblem-sidebar.c:822 ../src/nautilus-emblem-sidebar.c:876
+#: src/nautilus-emblem-sidebar.c:822 src/nautilus-emblem-sidebar.c:876
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Filen \"%s\" verkar inte vara en giltig bild."
 
-#: ../src/nautilus-emblem-sidebar.c:825
+#: src/nautilus-emblem-sidebar.c:825
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Den dragna filen verkar inte vara en giltig bild."
 
-#: ../src/nautilus-emblem-sidebar.c:1051
-msgid "Show Emblems"
-msgstr "Visa emblem"
-
-#: ../src/nautilus-file-management-properties.c:307
+#: src/nautilus-file-management-properties.c:307
 msgid "None"
 msgstr "Inget"
 
-#: ../src/nautilus-file-management-properties.glade.h:1
+#: src/nautilus-file-management-properties.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: ../src/nautilus-file-management-properties.glade.h:2
+#: src/nautilus-file-management-properties.glade.h:2
 msgid "1 GB"
 msgstr "1 GB"
 
-#: ../src/nautilus-file-management-properties.glade.h:5
+#: src/nautilus-file-management-properties.glade.h:5
 msgid "100 KB"
 msgstr "100 kB"
 
-#: ../src/nautilus-file-management-properties.glade.h:21
+#: src/nautilus-file-management-properties.glade.h:21
 msgid "500 KB"
 msgstr "500 kB"
 
-#: ../src/nautilus-file-management-properties.glade.h:24
+#: src/nautilus-file-management-properties.glade.h:24
 msgid "<span weight=\"bold\">Behavior</span>"
 msgstr "<span weight=\"bold\">Beteende</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:25
+#: src/nautilus-file-management-properties.glade.h:25
 msgid "<span weight=\"bold\">Date</span>"
 msgstr "<span weight=\"bold\">Datum</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:26
+#: src/nautilus-file-management-properties.glade.h:26
 msgid "<span weight=\"bold\">Default View</span>"
 msgstr "<span weight=\"bold\">Standardvy</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:27
+#: src/nautilus-file-management-properties.glade.h:27
 msgid "<span weight=\"bold\">Executable Text Files</span>"
 msgstr "<span weight=\"bold\">Körbara textfiler</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:28
+#: src/nautilus-file-management-properties.glade.h:28
 msgid "<span weight=\"bold\">Folders</span>"
 msgstr "<span weight=\"bold\">Mappar</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:29
+#: src/nautilus-file-management-properties.glade.h:29
 msgid "<span weight=\"bold\">Icon Captions</span>"
 msgstr "<span weight=\"bold\">Ikonrubriker</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:30
+#: src/nautilus-file-management-properties.glade.h:30
 msgid "<span weight=\"bold\">Icon View Defaults</span>"
 msgstr "<span weight=\"bold\">Standardalternativ för ikonvyn</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:31
+#: src/nautilus-file-management-properties.glade.h:31
 msgid "<span weight=\"bold\">List Columns</span>"
 msgstr "<span weight=\"bold\">Listkolumner</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:32
+#: src/nautilus-file-management-properties.glade.h:32
 msgid "<span weight=\"bold\">List View Defaults</span>"
 msgstr "<span weight=\"bold\">Standardalternativ för listvyn</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:33
+#: src/nautilus-file-management-properties.glade.h:33
 msgid "<span weight=\"bold\">Other Previewable Files</span>"
 msgstr "<span weight=\"bold\">Andra förhandsgranskningsbara filer</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:34
+#: src/nautilus-file-management-properties.glade.h:34
 msgid "<span weight=\"bold\">Sound Files</span>"
 msgstr "<span weight=\"bold\">Ljudfiler</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:35
+#: src/nautilus-file-management-properties.glade.h:35
 msgid "<span weight=\"bold\">Text Files</span>"
 msgstr "<span weight=\"bold\">Textfiler</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:36
+#: src/nautilus-file-management-properties.glade.h:36
 msgid "<span weight=\"bold\">Trash</span>"
 msgstr "<span weight=\"bold\">Papperskorg</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:37
+#: src/nautilus-file-management-properties.glade.h:37
 msgid "<span weight=\"bold\">Tree View Defaults</span>"
 msgstr "<span weight=\"bold\">Standardalternativ för trädvyn</span>"
 
-#: ../src/nautilus-file-management-properties.glade.h:38
+#: src/nautilus-file-management-properties.glade.h:38
 msgid "Always"
 msgstr "Alltid"
 
-#: ../src/nautilus-file-management-properties.glade.h:39
+#: src/nautilus-file-management-properties.glade.h:39
 msgid "Always open in _browser windows"
 msgstr "Öppna alltid i _bläddrarfönster"
 
-#: ../src/nautilus-file-management-properties.glade.h:40
+#: src/nautilus-file-management-properties.glade.h:40
 msgid "Ask before _emptying the Trash or deleting files"
 msgstr "Fråga innan papperskorgen _töms eller filer tas bort"
 
-#: ../src/nautilus-file-management-properties.glade.h:41
+#: src/nautilus-file-management-properties.glade.h:41
 msgid "Behavior"
 msgstr "Beteende"
 
-#: ../src/nautilus-file-management-properties.glade.h:47
+#: src/nautilus-file-management-properties.glade.h:47
 msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
@@ -4792,171 +4968,171 @@ msgstr ""
 "Välj i vilken ordning informationen ska visas under ikonnamn. Mer "
 "information visas när du zoomar in närmare."
 
-#: ../src/nautilus-file-management-properties.glade.h:48
+#: src/nautilus-file-management-properties.glade.h:48
 msgid "Choose the order of information to appear in the list view."
 msgstr "Välj den sortering av information som ska användas i listvyn."
 
-#: ../src/nautilus-file-management-properties.glade.h:49
+#: src/nautilus-file-management-properties.glade.h:49
 msgid "Count _number of items:"
 msgstr "Räkna _antal objekt:"
 
-#: ../src/nautilus-file-management-properties.glade.h:50
+#: src/nautilus-file-management-properties.glade.h:50
 msgid "Default _zoom level:"
 msgstr "Standardzoom_nivå:"
 
-#: ../src/nautilus-file-management-properties.glade.h:51
+#: src/nautilus-file-management-properties.glade.h:51
 msgid "Display"
 msgstr "Visa"
 
-#: ../src/nautilus-file-management-properties.glade.h:52
+#: src/nautilus-file-management-properties.glade.h:52
 msgid "File Management Preferences"
 msgstr "Inställningar för filhantering"
 
-#: ../src/nautilus-file-management-properties.glade.h:53
+#: src/nautilus-file-management-properties.glade.h:53
 msgid "I_nclude a Delete command that bypasses Trash"
 msgstr "_Inkludera ett kommando Ta bort som förbigår papperskorgen"
 
-#: ../src/nautilus-file-management-properties.glade.h:55
+#: src/nautilus-file-management-properties.glade.h:55
 msgid "List Columns"
 msgstr "Listkolumner"
 
-#: ../src/nautilus-file-management-properties.glade.h:57
+#: src/nautilus-file-management-properties.glade.h:57
 msgid "Local Files Only"
 msgstr "Endast lokala filer"
 
-#: ../src/nautilus-file-management-properties.glade.h:58
+#: src/nautilus-file-management-properties.glade.h:58
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: ../src/nautilus-file-management-properties.glade.h:59
+#: src/nautilus-file-management-properties.glade.h:59
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../src/nautilus-file-management-properties.glade.h:60
+#: src/nautilus-file-management-properties.glade.h:60
 msgid "Preview"
 msgstr "Förhandsgranskning"
 
-#: ../src/nautilus-file-management-properties.glade.h:61
+#: src/nautilus-file-management-properties.glade.h:61
 msgid "Preview _sound files:"
 msgstr "Förhandsgranska _ljudfiler:"
 
-#: ../src/nautilus-file-management-properties.glade.h:62
+#: src/nautilus-file-management-properties.glade.h:62
 msgid "Show _only folders"
 msgstr "Visa _endast mappar"
 
-#: ../src/nautilus-file-management-properties.glade.h:63
+#: src/nautilus-file-management-properties.glade.h:63
 msgid "Show _thumbnails:"
 msgstr "Visa _miniatyrbilder:"
 
-#: ../src/nautilus-file-management-properties.glade.h:64
+#: src/nautilus-file-management-properties.glade.h:64
 msgid "Show hidden and _backup files"
 msgstr "Visa dolda filer och _säkerhetskopior"
 
-#: ../src/nautilus-file-management-properties.glade.h:65
+#: src/nautilus-file-management-properties.glade.h:65
 msgid "Show te_xt in icons:"
 msgstr "Visa te_xt i ikoner:"
 
-#: ../src/nautilus-file-management-properties.glade.h:66
+#: src/nautilus-file-management-properties.glade.h:66
 msgid "Sort _folders before files"
 msgstr "Sortera _mappar före filer"
 
-#: ../src/nautilus-file-management-properties.glade.h:67
+#: src/nautilus-file-management-properties.glade.h:67
 msgid "View _new folders using:"
 msgstr "Visa _nya mappar genom att använda:"
 
-#: ../src/nautilus-file-management-properties.glade.h:68
+#: src/nautilus-file-management-properties.glade.h:68
 msgid "Views"
 msgstr "Vyer"
 
-#: ../src/nautilus-file-management-properties.glade.h:69
+#: src/nautilus-file-management-properties.glade.h:69
 msgid "_Arrange items:"
 msgstr "_Ordna objekt:"
 
-#: ../src/nautilus-file-management-properties.glade.h:71
+#: src/nautilus-file-management-properties.glade.h:71
 msgid "_Default zoom level:"
 msgstr "Standard_zoomnivå:"
 
-#: ../src/nautilus-file-management-properties.glade.h:72
+#: src/nautilus-file-management-properties.glade.h:72
 msgid "_Double click to activate items"
 msgstr "_Dubbelklick för att aktivera objekt"
 
-#: ../src/nautilus-file-management-properties.glade.h:73
+#: src/nautilus-file-management-properties.glade.h:73
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/nautilus-file-management-properties.glade.h:74
+#: src/nautilus-file-management-properties.glade.h:74
 msgid "_Only for files smaller than:"
 msgstr "_Endast för filer mindre än:"
 
-#: ../src/nautilus-file-management-properties.glade.h:75
+#: src/nautilus-file-management-properties.glade.h:75
 msgid "_Run executable text files when they are clicked"
 msgstr "_Kör körbara textfiler när de klickas"
 
-#: ../src/nautilus-file-management-properties.glade.h:76
+#: src/nautilus-file-management-properties.glade.h:76
 msgid "_Single click to activate items"
 msgstr "_Enkelklick för att aktivera objekt"
 
-#: ../src/nautilus-file-management-properties.glade.h:77
+#: src/nautilus-file-management-properties.glade.h:77
 msgid "_Text beside icons"
 msgstr "_Text bredvid ikoner"
 
-#: ../src/nautilus-file-management-properties.glade.h:78
+#: src/nautilus-file-management-properties.glade.h:78
 msgid "_Use compact layout"
 msgstr "_Använd kompakt layout"
 
-#: ../src/nautilus-file-management-properties.glade.h:79
+#: src/nautilus-file-management-properties.glade.h:79
 msgid "_View executable text files when they are clicked"
 msgstr "_Visa körbara textfiler när de klickas"
 
-#: ../src/nautilus-file-management-properties.glade.h:80
+#: src/nautilus-file-management-properties.glade.h:80
 msgid "date accessed"
 msgstr "Ã¥tkomstdatum"
 
-#: ../src/nautilus-file-management-properties.glade.h:81
+#: src/nautilus-file-management-properties.glade.h:81
 msgid "date modified"
 msgstr "ändringsdatum"
 
-#: ../src/nautilus-file-management-properties.glade.h:82
+#: src/nautilus-file-management-properties.glade.h:82
 msgid "group"
 msgstr "grupp"
 
-#: ../src/nautilus-file-management-properties.glade.h:83
+#: src/nautilus-file-management-properties.glade.h:83
 msgid "informal"
 msgstr "informellt"
 
-#: ../src/nautilus-file-management-properties.glade.h:84
+#: src/nautilus-file-management-properties.glade.h:84
 msgid "iso"
 msgstr "iso"
 
-#: ../src/nautilus-file-management-properties.glade.h:85
+#: src/nautilus-file-management-properties.glade.h:85
 msgid "locale"
 msgstr "lokal"
 
-#: ../src/nautilus-file-management-properties.glade.h:86
+#: src/nautilus-file-management-properties.glade.h:86
 msgid "none"
 msgstr "inget"
 
-#: ../src/nautilus-file-management-properties.glade.h:87
+#: src/nautilus-file-management-properties.glade.h:87
 msgid "octal permissions"
 msgstr "rättigheter på oktal form"
 
-#: ../src/nautilus-file-management-properties.glade.h:88
+#: src/nautilus-file-management-properties.glade.h:88
 msgid "owner"
 msgstr "ägare"
 
-#: ../src/nautilus-file-management-properties.glade.h:89
+#: src/nautilus-file-management-properties.glade.h:89
 msgid "permissions"
 msgstr "rättigheter"
 
-#: ../src/nautilus-file-management-properties.glade.h:90
+#: src/nautilus-file-management-properties.glade.h:90
 msgid "size"
 msgstr "storlek"
 
-#: ../src/nautilus-file-management-properties.glade.h:91
+#: src/nautilus-file-management-properties.glade.h:91
 msgid "type"
 msgstr "typ"
 
-#: ../src/nautilus-first-time-druid.c:40
+#: src/nautilus-first-time-druid.c:40
 msgid ""
 "Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
@@ -4968,177 +5144,165 @@ msgstr ""
 "\n"
 "Du kan manuellt ta bort denna fil för att visa guiden igen.\n"
 
-#: ../src/nautilus-history-sidebar.c:278
+#: src/nautilus-history-sidebar.c:278
 msgid "History"
 msgstr "Historik"
 
-#: ../src/nautilus-history-sidebar.c:284
-msgid "Show History"
-msgstr "Visa historik"
-
-#: ../src/nautilus-image-properties-page.c:219
+#: src/nautilus-image-properties-page.c:219
 msgid "Camera Brand"
 msgstr "Kameramärke"
 
-#: ../src/nautilus-image-properties-page.c:220
+#: src/nautilus-image-properties-page.c:220
 msgid "Camera Model"
 msgstr "Kameramodell"
 
-#: ../src/nautilus-image-properties-page.c:221
+#: src/nautilus-image-properties-page.c:221
 msgid "Date Taken"
 msgstr "Datum för tagning"
 
-#: ../src/nautilus-image-properties-page.c:222
+#: src/nautilus-image-properties-page.c:222
 msgid "Exposure Time"
 msgstr "Exponeringstid"
 
-#: ../src/nautilus-image-properties-page.c:223
+#: src/nautilus-image-properties-page.c:223
 msgid "Exposure Program"
 msgstr "Exponeringsprogram"
 
-#: ../src/nautilus-image-properties-page.c:224
+#: src/nautilus-image-properties-page.c:224
 msgid "Aperture Value"
 msgstr "Bländarvärde"
 
-#: ../src/nautilus-image-properties-page.c:225
+#: src/nautilus-image-properties-page.c:225
 msgid "Metering Mode"
 msgstr "Mätmetod"
 
-#: ../src/nautilus-image-properties-page.c:226
+#: src/nautilus-image-properties-page.c:226
 msgid "Flash Fired"
 msgstr "Blixt använd"
 
-#: ../src/nautilus-image-properties-page.c:227
+#: src/nautilus-image-properties-page.c:227
 msgid "Focal Length"
 msgstr "Brännvidd"
 
-#: ../src/nautilus-image-properties-page.c:228
+#: src/nautilus-image-properties-page.c:228
 msgid "Shutter Speed"
 msgstr "Slutarhastighet"
 
-#: ../src/nautilus-image-properties-page.c:229
+#: src/nautilus-image-properties-page.c:229
 msgid "ISO Speed Rating"
 msgstr "ISO-hastighetsgradering"
 
-#: ../src/nautilus-image-properties-page.c:230
+#: src/nautilus-image-properties-page.c:230
 msgid "Software"
 msgstr "Programvara"
 
-#: ../src/nautilus-image-properties-page.c:249
+#: src/nautilus-image-properties-page.c:249
 #, c-format
-msgid "<b>Image Type:</b> %s (%s)\n"
-msgstr "<b>Bildtyp:</b> %s (%s)\n"
-
-#: ../src/nautilus-image-properties-page.c:251
-#, c-format
-msgid "<b>Width:</b> %d pixel\n"
-msgid_plural "<b>Width:</b> %d pixels\n"
-msgstr[0] "<b>Bredd:</b> %d bildpunkt\n"
-msgstr[1] "<b>Bredd:</b> %d bildpunkter\n"
-
-#: ../src/nautilus-image-properties-page.c:255
-#, c-format
-msgid "<b>Height:</b> %d pixel\n"
-msgid_plural "<b>Height:</b> %d pixels\n"
-msgstr[0] "<b>Höjd:</b> %d bildpunkt\n"
-msgstr[1] "<b>Höjd:</b> %d bildpunkter\n"
+msgid ""
+"<b>Image Type:</b> %s (%s)\n"
+"<b>Resolution:</b> %dx%d pixels\n"
+msgid_plural ""
+"<b>Image Type:</b> %s (%s)\n"
+"<b>Resolution:</b> %dx%d pixels\n"
+msgstr[0] ""
+"<b>Bildtyp:</b>    %s (%s)\n"
+"<b>Upplösning:</b> %d×%d bildpunkt\n"
+msgstr[1] ""
+"<b>Bildtyp:</b>    %s (%s)\n"
+"<b>Upplösning:</b> %d×%d bildpunkter\n"
 
-#: ../src/nautilus-image-properties-page.c:270
+#: src/nautilus-image-properties-page.c:264
 msgid "Failed to load image information"
 msgstr "Misslyckades med att läsa in bildinformation"
 
-#: ../src/nautilus-image-properties-page.c:420
+#: src/nautilus-image-properties-page.c:414
 msgid "loading..."
 msgstr "läser in..."
 
-#: ../src/nautilus-image-properties-page.c:486
+#: src/nautilus-image-properties-page.c:480
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/nautilus-information-panel.c:178
+#: src/nautilus-information-panel.c:178
 msgid "Information"
 msgstr "Information"
 
-#: ../src/nautilus-information-panel.c:184
-msgid "Show Information"
-msgstr "Visa information"
-
 #. add the reset background item, possibly disabled
-#: ../src/nautilus-information-panel.c:404
+#: src/nautilus-information-panel.c:397
 msgid "Use _Default Background"
 msgstr "Använd standard_bakgrund"
 
-#: ../src/nautilus-information-panel.c:554
+#: src/nautilus-information-panel.c:547
 msgid "You can't assign more than one custom icon at a time."
 msgstr "Du kan inte tilldela mer än en anpassad ikon åt gången."
 
-#: ../src/nautilus-information-panel.c:583
+#: src/nautilus-information-panel.c:576
 msgid "You can only use images as custom icons."
 msgstr "Du kan endast använda lokala bilder som anpassade ikoner."
 
-#: ../src/nautilus-information-panel.c:898
+#: src/nautilus-information-panel.c:891
 #, c-format
 msgid "Open with %s"
 msgstr "Öppna med %s"
 
-#: ../src/nautilus-information-panel.c:993
+#: src/nautilus-information-panel.c:984
 msgid "Unable to launch the cd burner application."
 msgstr "Kan inte starta cd-brännarprogrammet."
 
-#: ../src/nautilus-information-panel.c:994
+#: src/nautilus-information-panel.c:985
 msgid "Can't Launch CD Burner"
 msgstr "Kan inte starta cd-brännare"
 
 #. FIXME: We don't use spaces to pad labels!
-#: ../src/nautilus-information-panel.c:1039
+#: src/nautilus-information-panel.c:1030
 msgid "Empty _Trash"
 msgstr "Töm _papperskorgen"
 
 #. FIXME: We don't use spaces to pad labels!
-#: ../src/nautilus-information-panel.c:1055
+#: src/nautilus-information-panel.c:1046
 msgid "_Write contents to CD"
 msgstr "_Skriv innehåll till cd"
 
-#: ../src/nautilus-location-bar.c:61
+#: src/nautilus-location-bar.c:61
 msgid "Go To:"
 msgstr "GÃ¥ till:"
 
-#: ../src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:154
 #, c-format
 msgid "Do you want to view %d location?"
 msgid_plural "Do you want to view %d locations?"
 msgstr[0] "Vill du se en plats?"
 msgstr[1] "Vill du se %d platser?"
 
-#: ../src/nautilus-location-bar.c:170
+#: src/nautilus-location-bar.c:170
 msgid "View in Multiple Windows?"
 msgstr "Visa i flera fönster?"
 
-#: ../src/nautilus-location-dialog.c:140
+#: src/nautilus-location-dialog.c:139
 msgid "Open Location"
 msgstr "Öppna plats"
 
-#: ../src/nautilus-location-dialog.c:151
+#: src/nautilus-location-dialog.c:150
 msgid "_Location:"
 msgstr "_Plats:"
 
-#: ../src/nautilus-main.c:269
+#: src/nautilus-main.c:268
 msgid "Perform a quick set of self-check tests."
 msgstr "Utför ett antal snabba självtester."
 
-#: ../src/nautilus-main.c:272
+#: src/nautilus-main.c:271
 msgid "Create the initial window with the given geometry."
 msgstr "Skapa det första fönstret med den angivna geometrin."
 
-#: ../src/nautilus-main.c:272
+#: src/nautilus-main.c:271
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: ../src/nautilus-main.c:274
+#: src/nautilus-main.c:273
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Skapa endast fönster för explicit angivna URI:er."
 
-#: ../src/nautilus-main.c:276
+#: src/nautilus-main.c:275
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -5146,41 +5310,40 @@ msgstr ""
 "Hantera inte skrivbordet (ignorera inställningen som är angiven i "
 "dialogfönstret inställningar)."
 
-#: ../src/nautilus-main.c:278
+#: src/nautilus-main.c:277
 msgid "open a browser window."
 msgstr "öppna ett bläddrarfönster."
 
-#: ../src/nautilus-main.c:280
+#: src/nautilus-main.c:279
 msgid "Quit Nautilus."
 msgstr "Avsluta Nautilus."
 
-#: ../src/nautilus-main.c:282
+#: src/nautilus-main.c:281
 msgid "Restart Nautilus."
 msgstr "Starta om Nautilus."
 
-#: ../src/nautilus-main.c:326
+#: src/nautilus-main.c:325
 msgid "File Manager"
 msgstr "Filhanterare"
 
 #. Set initial window title
-#: ../src/nautilus-main.c:332 ../src/nautilus-spatial-window.c:330
-#: ../src/nautilus-window-menus.c:444 ../src/nautilus-window.c:151
+#: src/nautilus-main.c:331 src/nautilus-spatial-window.c:330
+#: src/nautilus-window-menus.c:442 src/nautilus-window.c:147
 msgid "Nautilus"
 msgstr "Nautilus"
 
 #. translators: %s is an option (e.g. --check)
-#: ../src/nautilus-main.c:364 ../src/nautilus-main.c:373
-#: ../src/nautilus-main.c:378
+#: src/nautilus-main.c:363 src/nautilus-main.c:372 src/nautilus-main.c:377
 #, c-format
 msgid "nautilus: %s cannot be used with URIs.\n"
 msgstr "nautilus: %s kan inte användas med URI:er.\n"
 
-#: ../src/nautilus-main.c:369
+#: src/nautilus-main.c:368
 #, c-format
 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:383
+#: src/nautilus-main.c:382
 #, c-format
 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"
@@ -5188,350 +5351,310 @@ msgstr "nautilus: --geometry kan inte användas med mer än en URI.\n"
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: ../src/nautilus-navigation-window-menus.c:115
+#: src/nautilus-navigation-window-menus.c:127
 msgid "Are you sure you want to forget history?"
 msgstr "Är du säker på att du vill glömma historien?"
 
-#: ../src/nautilus-navigation-window-menus.c:116
+#: src/nautilus-navigation-window-menus.c:128
 msgid "If you do, you will be doomed to repeat it."
 msgstr "I så fall kommer du att vara dömd att återupprepa den."
 
-#: ../src/nautilus-navigation-window-menus.c:118
+#: src/nautilus-navigation-window-menus.c:130
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Är du säker på att du vill tömma listan över platser som du har besökt?"
 
-#: ../src/nautilus-navigation-window-menus.c:120
+#: src/nautilus-navigation-window-menus.c:132
 msgid "If you clear the list of locations, they will be permanently deleted."
 msgstr "Om du tömmer listan över platser kommer de att tas bort permanent."
 
-#: ../src/nautilus-navigation-window-menus.c:126
+#: src/nautilus-navigation-window-menus.c:138
 msgid "Clear History"
 msgstr "Töm historik"
 
-#: ../src/nautilus-navigation-window-menus.c:288
-#: ../src/nautilus-window-bookmarks.c:96
+#: src/nautilus-navigation-window-menus.c:287
+msgid ""
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr "Vill du ta bort alla bokmärken med denna plats från din lista?"
+
+#: src/nautilus-navigation-window-menus.c:289
 #, c-format
 msgid "The location \"%s\" does not exist."
 msgstr "Platsen \"%s\" finns inte."
 
-#: ../src/nautilus-navigation-window-menus.c:290
-msgid "The history location doesn't exist."
-msgstr "Historikplatsen finns inte."
-
-#: ../src/nautilus-navigation-window-menus.c:292
-#: ../src/nautilus-window-bookmarks.c:99
+#: src/nautilus-navigation-window-menus.c:292
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bokmärke för icke-existerande plats"
 
-#: ../src/nautilus-navigation-window-menus.c:416
+#: src/nautilus-navigation-window-menus.c:293
+msgid "Remove"
+msgstr "Ta bort"
+
+#: src/nautilus-navigation-window-menus.c:545
 msgid "_Go"
 msgstr "_GÃ¥"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:417
+#: src/nautilus-navigation-window-menus.c:546
 msgid "_Bookmarks"
 msgstr "_Bokmärken"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:418
+#: src/nautilus-navigation-window-menus.c:547
 msgid "Open New _Window"
 msgstr "Öppna nytt _fönster"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:419
+#: src/nautilus-navigation-window-menus.c:548
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Öppna ytterligare ett Nautilus-fönster för den visade platsen"
 
-#: ../src/nautilus-navigation-window-menus.c:421
+#: src/nautilus-navigation-window-menus.c:550
 msgid "Close _All Windows"
 msgstr "Stäng _alla fönster"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:422
+#: src/nautilus-navigation-window-menus.c:551
 msgid "Close all Navigation windows"
 msgstr "Stäng alla navigeringsfönster"
 
-#: ../src/nautilus-navigation-window-menus.c:424
+#: src/nautilus-navigation-window-menus.c:553
 msgid "_Location..."
 msgstr "Pl_ats..."
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:425
-#: ../src/nautilus-spatial-window.c:730
+#: src/nautilus-navigation-window-menus.c:554
+#: src/nautilus-spatial-window.c:582
 msgid "Specify a location to open"
 msgstr "Ange en plats att öppna"
 
-#: ../src/nautilus-navigation-window-menus.c:427
+#: src/nautilus-navigation-window-menus.c:556
 msgid "Clea_r History"
 msgstr "T_öm historik"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:557
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr "Töm innehållet i Gå-menyn och Föregående/Nästa-listorna"
 
-#: ../src/nautilus-navigation-window-menus.c:430
-#: ../src/nautilus-spatial-window.c:738
+#: src/nautilus-navigation-window-menus.c:559
 msgid "_Add Bookmark"
 msgstr "_Lägg till bokmärke"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:431
-#: ../src/nautilus-spatial-window.c:739
+#: src/nautilus-navigation-window-menus.c:560
 msgid "Add a bookmark for the current location to this menu"
 msgstr "Lägg till ett bokmärke för den aktuella platsen till denna meny"
 
-#: ../src/nautilus-navigation-window-menus.c:433
-#: ../src/nautilus-spatial-window.c:741
+#: src/nautilus-navigation-window-menus.c:562
 msgid "_Edit Bookmarks"
 msgstr "_Redigera bokmärken"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:434
-#: ../src/nautilus-spatial-window.c:742
+#: src/nautilus-navigation-window-menus.c:563
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Visa ett fönster som tillåter redigering av bokmärkena i denna meny"
 
 #. name, stock id
-#: ../src/nautilus-navigation-window-menus.c:440
-msgid "_Main Toolbar"
-msgstr "_Huvudverktygsrad"
-
-#. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:441
-msgid "Change the visibility of this window's main toolbar"
-msgstr "Ändra synligheten på detta fönsters huvudverktygsrad"
-
-#. is_active
-#. name, stock id
-#: ../src/nautilus-navigation-window-menus.c:445
+#: src/nautilus-navigation-window-menus.c:569
 msgid "_Side Pane"
 msgstr "Sido_panel"
 
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:446
+#: src/nautilus-navigation-window-menus.c:570
 msgid "Change the visibility of this window's sidebar"
 msgstr "Ändra synligheten på detta fönsters sidopanel"
 
 #. is_active
 #. name, stock id
-#: ../src/nautilus-navigation-window-menus.c:450
+#: src/nautilus-navigation-window-menus.c:574
 msgid "Location _Bar"
 msgstr "_Adressrad"
 
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:451
+#: src/nautilus-navigation-window-menus.c:575
 msgid "Change the visibility of this window's location bar"
 msgstr "Ändra synligheten på detta fönsters adressrad"
 
 #. is_active
 #. name, stock id
-#: ../src/nautilus-navigation-window-menus.c:455
+#: src/nautilus-navigation-window-menus.c:579
 msgid "St_atusbar"
 msgstr "Status_rad"
 
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:456
+#: src/nautilus-navigation-window-menus.c:580
 msgid "Change the visibility of this window's statusbar"
 msgstr "Ändra synligheten på detta fönsters statusrad"
 
-#: ../src/nautilus-navigation-window-menus.c:480
+#: src/nautilus-navigation-window-menus.c:604
 msgid "_Back"
 msgstr "_Bakåt"
 
-#: ../src/nautilus-navigation-window-menus.c:482
+#: src/nautilus-navigation-window-menus.c:606
 msgid "Go to the previous visited location"
 msgstr "Gå till föregående besökta plats"
 
-#: ../src/nautilus-navigation-window-menus.c:483
-msgid "Back history"
-msgstr "Gå bakåt i historiken"
-
-#: ../src/nautilus-navigation-window-menus.c:497
+#: src/nautilus-navigation-window-menus.c:620
 msgid "_Forward"
 msgstr "_Framåt"
 
-#: ../src/nautilus-navigation-window-menus.c:499
+#: src/nautilus-navigation-window-menus.c:622
 msgid "Go to the next visited location"
 msgstr "Gå till nästa besökta plats"
 
-#: ../src/nautilus-navigation-window-menus.c:500
-msgid "Forward history"
-msgstr "Gå framåt i historiken"
+#: src/nautilus-navigation-window.c:613 src/nautilus-window.c:674
+#, c-format
+msgid "View as %s"
+msgstr "Visa som %s"
 
-#: ../src/nautilus-navigation-window.c:793
+#: src/nautilus-navigation-window.c:689
 #, c-format
 msgid "%s - File Browser"
 msgstr "%s - Filbläddrare"
 
-#: ../src/nautilus-notes-viewer.c:388 ../src/nautilus-notes-viewer.c:498
+#: src/nautilus-notes-viewer.c:388 src/nautilus-notes-viewer.c:495
 msgid "Notes"
 msgstr "Anteckningar"
 
-#: ../src/nautilus-notes-viewer.c:394
-msgid "Show Notes"
-msgstr "Visa anteckningar"
-
-#: ../src/nautilus-pathbar.c:1128 ../src/nautilus-places-sidebar.c:152
-msgid "Home"
-msgstr "Hem"
-
-#: ../src/nautilus-places-sidebar.c:474
-msgid "Places"
-msgstr "Platser"
-
-#: ../src/nautilus-places-sidebar.c:480
-msgid "Show Places"
-msgstr "Visa platser"
-
 #. set the title and standard close accelerator
-#: ../src/nautilus-property-browser.c:278
+#: src/nautilus-property-browser.c:270
 msgid "Backgrounds and Emblems"
 msgstr "Bakgrunder och emblem"
 
-#: ../src/nautilus-property-browser.c:387
+#: src/nautilus-property-browser.c:379
 msgid "_Remove..."
 msgstr "_Ta bort..."
 
-#: ../src/nautilus-property-browser.c:407
+#: src/nautilus-property-browser.c:399
 msgid "_Add new..."
 msgstr "_Lägg till ny..."
 
-#: ../src/nautilus-property-browser.c:960
+#: src/nautilus-property-browser.c:905
 #, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Tyvärr, mönstret %s kunde inte tas bort."
 
-#: ../src/nautilus-property-browser.c:961
+#: src/nautilus-property-browser.c:906
 msgid "Check that you have permission to delete the pattern."
 msgstr ""
 "Kontrollera att du har de rättigheter som krävs för att ta bort mönstret."
 
-#: ../src/nautilus-property-browser.c:962
+#: src/nautilus-property-browser.c:907
 msgid "Couldn't Delete Pattern"
 msgstr "Kunde inte ta bort mönster"
 
-#: ../src/nautilus-property-browser.c:990
+#: src/nautilus-property-browser.c:935
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Tyvärr, emblemet %s kunde inte tas bort."
 
-#: ../src/nautilus-property-browser.c:991
+#: src/nautilus-property-browser.c:936
 msgid "Check that you have permission to delete the emblem."
 msgstr ""
 "Kontrollera att du har de rättigheter som krävs för att ta bort emblemet."
 
-#: ../src/nautilus-property-browser.c:992
+#: src/nautilus-property-browser.c:937
 msgid "Couldn't Delete Emblem"
 msgstr "Kunde inte ta bort emblem"
 
-#: ../src/nautilus-property-browser.c:1030
+#: src/nautilus-property-browser.c:975
 msgid "Create a New Emblem:"
 msgstr "Skapa ett nytt emblem:"
 
 #. make the keyword label and field
-#: ../src/nautilus-property-browser.c:1043
+#: src/nautilus-property-browser.c:988
 msgid "_Keyword:"
 msgstr "_Nyckelord:"
 
 #. set up a gnome icon entry to pick the image file
-#: ../src/nautilus-property-browser.c:1061
+#: src/nautilus-property-browser.c:1006
 msgid "_Image:"
 msgstr "_Bild:"
 
-#: ../src/nautilus-property-browser.c:1065
+#: src/nautilus-property-browser.c:1010
 msgid "Select an image file for the new emblem:"
 msgstr "Välj en bildfil för det nya emblemet:"
 
-#: ../src/nautilus-property-browser.c:1089
+#: src/nautilus-property-browser.c:1034
 msgid "Create a New Color:"
 msgstr "Skapa en ny färg:"
 
 #. make the name label and field
-#: ../src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1048
 msgid "Color _name:"
 msgstr "Färg_namn:"
 
-#: ../src/nautilus-property-browser.c:1119
+#: src/nautilus-property-browser.c:1064
 msgid "Color _value:"
 msgstr "Färg_värde:"
 
-#: ../src/nautilus-property-browser.c:1151
+#: src/nautilus-property-browser.c:1096
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Tyvärr, \"%s\" är inte ett giltigt filnamn."
 
-#: ../src/nautilus-property-browser.c:1154
+#: src/nautilus-property-browser.c:1099
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Tyvärr, du angav inte ett giltigt filnamn."
 
-#: ../src/nautilus-property-browser.c:1155
+#: src/nautilus-property-browser.c:1100
 msgid "Please try again."
 msgstr "Försök igen."
 
-#: ../src/nautilus-property-browser.c:1157
-#: ../src/nautilus-property-browser.c:1202
+#: src/nautilus-property-browser.c:1102 src/nautilus-property-browser.c:1147
 msgid "Couldn't Install Pattern"
 msgstr "Kunde inte installera mönster"
 
-#: ../src/nautilus-property-browser.c:1168
+#: src/nautilus-property-browser.c:1113
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Tyvärr, du kan inte ersätta återställningsbilden."
 
-#: ../src/nautilus-property-browser.c:1169
+#: src/nautilus-property-browser.c:1114
 msgid "Reset is a special image that cannot be deleted."
 msgstr "Återställ är en speciell bild som inte kan tas bort."
 
-#: ../src/nautilus-property-browser.c:1170
-#: ../src/nautilus-property-browser.c:1396
-#: ../src/nautilus-property-browser.c:1412
+#: src/nautilus-property-browser.c:1115 src/nautilus-property-browser.c:1319
+#: src/nautilus-property-browser.c:1335
 msgid "Not an Image"
 msgstr "Inte en bild"
 
-#: ../src/nautilus-property-browser.c:1201
+#: src/nautilus-property-browser.c:1146
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Tyvärr, mönstret %s kunde inte installeras."
 
-#: ../src/nautilus-property-browser.c:1221
+#: src/nautilus-property-browser.c:1166
 msgid "Select an image file to add as a pattern"
 msgstr "Välj en bildfil att lägga till som mönster"
 
-#: ../src/nautilus-property-browser.c:1273
-#: ../src/nautilus-property-browser.c:1304
+#: src/nautilus-property-browser.c:1227
 msgid "The color cannot be installed."
 msgstr "Färgen kan inte installeras."
 
-#: ../src/nautilus-property-browser.c:1274
-msgid "Sorry, but you must specify an unused color name for the new color."
-msgstr "Tyvärr, du måste ange ett oanvänt färgnamn för den nya färgen."
+#: src/nautilus-property-browser.c:1228
+msgid "Sorry, but you must specify a non-blank name for the new color."
+msgstr "Tyvärr, du måste ange ett icke-tomt namn för den nya färgen."
 
-#: ../src/nautilus-property-browser.c:1275
-#: ../src/nautilus-property-browser.c:1306
+#: src/nautilus-property-browser.c:1229
 msgid "Couldn't Install Color"
 msgstr "Kunde inte installera färg"
 
-#: ../src/nautilus-property-browser.c:1305
-msgid "Sorry, but you must specify a non-blank name for the new color."
-msgstr "Tyvärr, du måste ange ett icke-tomt namn för den nya färgen."
-
-#: ../src/nautilus-property-browser.c:1358
+#: src/nautilus-property-browser.c:1281
 msgid "Select a color to add"
 msgstr "Välj en färg att lägga till"
 
-#: ../src/nautilus-property-browser.c:1395
-#: ../src/nautilus-property-browser.c:1411
+#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
 #, c-format
 msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Tyvärr, \"%s\" är inte en användbar bildfil."
 
-#: ../src/nautilus-property-browser.c:1396
-#: ../src/nautilus-property-browser.c:1412
+#: src/nautilus-property-browser.c:1319 src/nautilus-property-browser.c:1335
 msgid "The file is not an image."
 msgstr "Filen är inte en bild."
 
-#: ../src/nautilus-property-browser.c:2089
+#: src/nautilus-property-browser.c:2040
 msgid "Select a Category:"
 msgstr "Välj en kategori:"
 
@@ -5541,153 +5664,157 @@ msgstr "Välj en kategori:"
 # Jag vill ha "A_vbryt borttagning"
 # men jag går med på ändringen.
 #
-#: ../src/nautilus-property-browser.c:2098
+#: src/nautilus-property-browser.c:2049
 msgid "C_ancel Remove"
 msgstr "A_vbryt ta bort"
 
 # SUN CHANGED MESSAGE
-#: ../src/nautilus-property-browser.c:2104
+#: src/nautilus-property-browser.c:2055
 msgid "_Add a New Pattern..."
 msgstr "_Lägg till ett nytt mönster..."
 
 # SUN CHANGED MESSAGE
-#: ../src/nautilus-property-browser.c:2107
+#: src/nautilus-property-browser.c:2058
 msgid "_Add a New Color..."
 msgstr "_Lägg till en ny färg..."
 
 # SUN CHANGED MESSAGE
-#: ../src/nautilus-property-browser.c:2110
+#: src/nautilus-property-browser.c:2061
 msgid "_Add a New Emblem..."
 msgstr "_Lägg till ett nytt emblem..."
 
-#: ../src/nautilus-property-browser.c:2133
+#: src/nautilus-property-browser.c:2084
 msgid "Click on a pattern to remove it"
 msgstr "Klicka på ett mönster för att ta bort det"
 
-#: ../src/nautilus-property-browser.c:2136
+#: src/nautilus-property-browser.c:2087
 msgid "Click on a color to remove it"
 msgstr "Klicka på en färg för att ta bort den"
 
-#: ../src/nautilus-property-browser.c:2139
+#: src/nautilus-property-browser.c:2090
 msgid "Click on an emblem to remove it"
 msgstr "Klicka på ett emblem för att ta bort det"
 
-#: ../src/nautilus-property-browser.c:2148
+#: src/nautilus-property-browser.c:2099
 msgid "Patterns:"
 msgstr "Mönster:"
 
-#: ../src/nautilus-property-browser.c:2151
+#: src/nautilus-property-browser.c:2102
 msgid "Colors:"
 msgstr "Färger:"
 
-#: ../src/nautilus-property-browser.c:2154
+#: src/nautilus-property-browser.c:2105
 msgid "Emblems:"
 msgstr "Emblem:"
 
 # SUN CHANGED MESSAGE
-#: ../src/nautilus-property-browser.c:2174
+#: src/nautilus-property-browser.c:2125
 msgid "_Remove a Pattern..."
 msgstr "_Ta bort ett mönster..."
 
 # SUN CHANGED MESSAGE
-#: ../src/nautilus-property-browser.c:2177
+#: src/nautilus-property-browser.c:2128
 msgid "_Remove a Color..."
 msgstr "_Ta bort en färg..."
 
 # SUN CHANGED MESSAGE
-#: ../src/nautilus-property-browser.c:2180
+#: src/nautilus-property-browser.c:2131
 msgid "_Remove an Emblem..."
 msgstr "_Ta bort ett emblem..."
 
-#: ../src/nautilus-side-pane.c:427
+#: src/nautilus-side-pane.c:425
 msgid "Close the side pane"
 msgstr "Stäng sidopanelen"
 
-#: ../src/nautilus-spatial-window.c:728
+#: src/nautilus-side-pane.c:596
+#, c-format
+msgid "Show %s"
+msgstr "Visa %s"
+
+#: src/nautilus-spatial-window.c:580
 msgid "_Places"
 msgstr "_Platser"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:729
+#: src/nautilus-spatial-window.c:581
 msgid "Open _Location..."
 msgstr "Öppna _plats..."
 
-#: ../src/nautilus-spatial-window.c:732
+#: src/nautilus-spatial-window.c:584
 msgid "Close P_arent Folders"
 msgstr "Stäng _föräldermappar"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:733
+#: src/nautilus-spatial-window.c:585
 msgid "Close this folder's parents"
 msgstr "Stäng föräldrarna till denna mapp"
 
-#: ../src/nautilus-spatial-window.c:735
+#: src/nautilus-spatial-window.c:587
 msgid "Clos_e All Folders"
 msgstr "Stän_g alla mappar"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:736
+#: src/nautilus-spatial-window.c:588
 msgid "Close all folder windows"
 msgstr "Stäng alla mappfönster"
 
-#: ../src/nautilus-throbber.c:514
+#: src/nautilus-throbber.c:514
 msgid "throbber"
 msgstr "snurra"
 
-#: ../src/nautilus-throbber.c:515
+#: src/nautilus-throbber.c:515
 msgid "provides visual status"
 msgstr "tillhandahåller synlig status"
 
-#: ../src/nautilus-window-bookmarks.c:94
-msgid ""
-"Do you want to remove any bookmarks with the non-existing location from your "
-"list?"
-msgstr "Vill du ta bort alla bokmärken med denna plats från din lista?"
+#: src/nautilus-window-manage-views.c:579
+msgid "View Failed"
+msgstr "Vy misslyckades"
 
-#: ../src/nautilus-window-bookmarks.c:100
-msgid "Remove"
-msgstr "Ta bort"
+#: src/nautilus-window-manage-views.c:590
+#, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s-vyn råkade ut för ett fel och kan inte fortsätta."
 
-#: ../src/nautilus-window-manage-views.c:599
+#: src/nautilus-window-manage-views.c:591
 msgid "You can choose another view or go to a different location."
 msgstr "Du kan välja en annan vy eller gå till en annan plats."
 
-#: ../src/nautilus-window-manage-views.c:600
-#: ../src/nautilus-window-manage-views.c:614
-msgid "View Failed"
-msgstr "Vy misslyckades"
+#: src/nautilus-window-manage-views.c:601
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr "%s-vyn råkade ut för ett fel vid uppstarten."
 
-#: ../src/nautilus-window-manage-views.c:613
+#: src/nautilus-window-manage-views.c:602
 msgid "The location cannot be displayed with this viewer."
 msgstr "Platsen kan inte visas med denna visare."
 
-#: ../src/nautilus-window-manage-views.c:1003
+#: src/nautilus-window-manage-views.c:989
 msgid "Content View"
 msgstr "Innehållsvy"
 
-#: ../src/nautilus-window-manage-views.c:1004
+#: src/nautilus-window-manage-views.c:990
 msgid "View of the current folder"
 msgstr "Vy med aktuell mapp"
 
-#: ../src/nautilus-window-manage-views.c:1361
+#: src/nautilus-window-manage-views.c:1346
 msgid "Nautilus has no installed viewer capable of displaying the folder."
 msgstr "Nautilus har ingen installerad visare som kan visa mappen."
 
-#: ../src/nautilus-window-manage-views.c:1367
+#: src/nautilus-window-manage-views.c:1352
 msgid "The location is not a folder."
 msgstr "Platsen är ingen mapp."
 
-#: ../src/nautilus-window-manage-views.c:1394
+#: src/nautilus-window-manage-views.c:1379
 #, c-format
 msgid "Nautilus cannot handle %s: locations."
 msgstr "Nautilus kan inte hantera %s:-platser."
 
-#: ../src/nautilus-window-manage-views.c:1429
+#: src/nautilus-window-manage-views.c:1414
 msgid "Check that your proxy settings are correct."
 msgstr "Kontrollera att dina proxyserverinställningar stämmer."
 
 # Osäker.
-#: ../src/nautilus-window-manage-views.c:1434
+#: src/nautilus-window-manage-views.c:1419
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
@@ -5696,24 +5823,24 @@ msgstr ""
 "Kunde inte visa \"%s\", eftersom Nautilus inte kan kontakta SMB-"
 "huvudbläddraren."
 
-#: ../src/nautilus-window-manage-views.c:1437
+#: src/nautilus-window-manage-views.c:1422
 msgid "Check that an SMB server is running in the local network."
 msgstr "Kontrollera att en SMB-server körs på det lokala nätverket."
 
-#: ../src/nautilus-window-manage-views.c:1442
+#: src/nautilus-window-manage-views.c:1427
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kan inte visa \"%s\"."
 
-#: ../src/nautilus-window-manage-views.c:1444
+#: src/nautilus-window-manage-views.c:1429
 msgid "Please select another viewer and try again."
 msgstr "Välj en annan visare och försök igen."
 
-#: ../src/nautilus-window-menus.c:177
+#: src/nautilus-window-menus.c:175
 msgid "Go to the location specified by this bookmark"
 msgstr "Gå till platsen som detta bokmärke anger"
 
-#: ../src/nautilus-window-menus.c:409
+#: src/nautilus-window-menus.c:407
 msgid ""
 "Nautilus is free software; you can redistribute it and/or modify \n"
 "it under the terms of the GNU General Public License as published by \n"
@@ -5729,7 +5856,7 @@ msgstr ""
 "av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
 "någon senare version."
 
-#: ../src/nautilus-window-menus.c:413
+#: src/nautilus-window-menus.c:411
 msgid ""
 "Nautilus is distributed in the hope that it will be useful, \n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of \n"
@@ -5741,7 +5868,7 @@ msgstr ""
 "LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License\n"
 "för ytterligare information."
 
-#: ../src/nautilus-window-menus.c:417
+#: src/nautilus-window-menus.c:415
 msgid ""
 "You should have received a copy of the GNU General Public License \n"
 "along with Nautilus; if not, write to the Free Software Foundation, Inc., \n"
@@ -5751,7 +5878,7 @@ msgstr ""
 "med Nautilus. Om inte, skriv till Free Software Foundation, Inc.,\n"
 "59 Temple Place, Suite 330, Boston, MA 02111-1307, USA."
 
-#: ../src/nautilus-window-menus.c:446
+#: src/nautilus-window-menus.c:444
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -5759,11 +5886,11 @@ msgstr ""
 "Nautilus är ett grafiskt skal till GNOME som gör det enkelt att hantera dina "
 "filer och resten av ditt system."
 
-#: ../src/nautilus-window-menus.c:450
+#: src/nautilus-window-menus.c:448
 msgid "Copyright © 1999-2005 The Nautilus authors"
 msgstr "Copyright © 1999-2005 Nautilus-författarna"
 
-#: ../src/nautilus-window-menus.c:455
+#: src/nautilus-window-menus.c:453
 msgid "translator-credits"
 msgstr ""
 "Christian Rose\n"
@@ -5771,565 +5898,242 @@ msgstr ""
 "Richard Hult\n"
 "Skicka synpunkter på översättningen till sv@li.org"
 
-#: ../src/nautilus-window-menus.c:595
+#: src/nautilus-window-menus.c:590
 msgid "_File"
 msgstr "_Arkiv"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:596
+#: src/nautilus-window-menus.c:591
 msgid "_Edit"
 msgstr "_Redigera"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:597
+#: src/nautilus-window-menus.c:592
 msgid "_View"
 msgstr "_Visa"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:598
+#: src/nautilus-window-menus.c:593
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. name, stock id, label
 #. name, stock id
-#: ../src/nautilus-window-menus.c:600
+#: src/nautilus-window-menus.c:595
 msgid "_Close"
 msgstr "S_täng"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:601
+#: src/nautilus-window-menus.c:596
 msgid "Close this folder"
 msgstr "Stäng denna mapp"
 
-#: ../src/nautilus-window-menus.c:604
+#: src/nautilus-window-menus.c:599
 msgid "_Backgrounds and Emblems..."
 msgstr "Bakgrunder och _emblem..."
 
-#: ../src/nautilus-window-menus.c:605
+#: src/nautilus-window-menus.c:600
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 "Visa mönster, färger och emblem som kan användas för att ändra utseendet"
 
-#: ../src/nautilus-window-menus.c:608
+#: src/nautilus-window-menus.c:603
 msgid "Prefere_nces"
 msgstr "_Inställningar"
 
-#: ../src/nautilus-window-menus.c:609
+#: src/nautilus-window-menus.c:604
 msgid "Edit Nautilus preferences"
 msgstr "Redigera inställningar för Nautilus"
 
-#: ../src/nautilus-window-menus.c:611
+#: src/nautilus-window-menus.c:606
 msgid "_Undo"
 msgstr "_Ã…ngra"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:612
+#: src/nautilus-window-menus.c:607
 msgid "Undo the last text change"
 msgstr "Ångra den senaste textändringen"
 
-#: ../src/nautilus-window-menus.c:614
+#: src/nautilus-window-menus.c:609
 msgid "Open _Parent"
 msgstr "Öppna _förälder"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:615
+#: src/nautilus-window-menus.c:610
 msgid "Open the parent folder"
 msgstr "Öppna föräldermappen"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:621
+#: src/nautilus-window-menus.c:616
 msgid "_Stop"
 msgstr "_Stopp"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:625
+#: src/nautilus-window-menus.c:620
 msgid "_Reload"
 msgstr "_Läs om"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:629
+#: src/nautilus-window-menus.c:624
 msgid "_Contents"
 msgstr "_Innehåll"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:630
+#: src/nautilus-window-menus.c:625
 msgid "Display Nautilus help"
 msgstr "Visa hjälp för Nautilus"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:633
+#: src/nautilus-window-menus.c:628
 msgid "_About"
 msgstr "_Om"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:634
+#: src/nautilus-window-menus.c:629
 msgid "Display credits for the creators of Nautilus"
 msgstr "Visa lista över skaparna av Nautilus"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:637
+#: src/nautilus-window-menus.c:632
 msgid "Zoom _In"
 msgstr "Zooma _in"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:638 ../src/nautilus-zoom-control.c:96
+#: src/nautilus-window-menus.c:633 src/nautilus-zoom-control.c:97
 msgid "Show the contents in more detail"
 msgstr "Visa innehållet mer detaljerat"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:649
+#: src/nautilus-window-menus.c:636
 msgid "Zoom _Out"
 msgstr "Zooma _ut"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:650 ../src/nautilus-zoom-control.c:97
+#: src/nautilus-window-menus.c:637 src/nautilus-zoom-control.c:98
 msgid "Show the contents in less detail"
 msgstr "Visa innehållet mindre detaljerat"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:657
+#: src/nautilus-window-menus.c:640
 msgid "Normal Si_ze"
 msgstr "_Normal storlek"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:658
+#: src/nautilus-window-menus.c:641
 msgid "Show the contents at the normal size"
 msgstr "Visa innehållet i normal storlek"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:661
+#: src/nautilus-window-menus.c:644
 msgid "Connect to _Server..."
 msgstr "Anslut till _server..."
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:662
+#: src/nautilus-window-menus.c:645
 msgid "Set up a connection to a network server"
 msgstr "Konfigurera en anslutning till en nätverksserver"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:665
+#: src/nautilus-window-menus.c:648
 msgid "_Home"
 msgstr "_Hem"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:666
+#: src/nautilus-window-menus.c:649
 msgid "Go to the home folder"
 msgstr "GÃ¥ till hemmappen"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:669
+#: src/nautilus-window-menus.c:652
 msgid "_Computer"
 msgstr "_Dator"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:670
+#: src/nautilus-window-menus.c:653
 msgid "Go to the computer location"
 msgstr "GÃ¥ till datorplatsen"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:673
+#: src/nautilus-window-menus.c:656
 msgid "T_emplates"
 msgstr "_Mallar"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:674
+#: src/nautilus-window-menus.c:657
 msgid "Go to the templates folder"
 msgstr "GÃ¥ till mallmappen"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:677
+#: src/nautilus-window-menus.c:660
 msgid "_Trash"
 msgstr "_Papperskorg"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:678
+#: src/nautilus-window-menus.c:661
 msgid "Go to the trash folder"
 msgstr "GÃ¥ till papperskorgsmappen"
 
 #. name, stock id
-#: ../src/nautilus-window-menus.c:681
+#: src/nautilus-window-menus.c:664
 msgid "CD/_DVD Creator"
 msgstr "Cd/_dvd-skapare"
 
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:682
+#: src/nautilus-window-menus.c:665
 msgid "Go to the CD/DVD Creator"
 msgstr "GÃ¥ till cd/dvd-skaparen"
 
-#: ../src/nautilus-window-menus.c:708
+#: src/nautilus-window-menus.c:691
 msgid "_Up"
 msgstr "_Upp"
 
-#: ../src/nautilus-zoom-control.c:84
+#: src/nautilus-window.c:675
+#, c-format
+msgid "Display this location with \"%s\""
+msgstr "Visa denna plats med \"%s\""
+
+#: src/nautilus-window.c:1461
+msgid "Application"
+msgstr "Program"
+
+#: src/nautilus-window.c:1462
+msgid "The NautilusApplication associated with this window."
+msgstr "Den NautilusApplication som är associerad med detta fönster."
+
+#: src/nautilus-zoom-control.c:85
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: ../src/nautilus-zoom-control.c:85
+#: src/nautilus-zoom-control.c:86
 msgid "Zoom Out"
 msgstr "Zooma ut"
 
-#: ../src/nautilus-zoom-control.c:86
+#: src/nautilus-zoom-control.c:87
 msgid "Zoom to Default"
 msgstr "Zooma till standard"
 
-#: ../src/nautilus-zoom-control.c:98
+#: src/nautilus-zoom-control.c:99
 msgid "Show in the default detail level"
 msgstr "Visa med standarddetaljnivån"
 
-#: ../src/nautilus-zoom-control.c:801
+#: src/nautilus-zoom-control.c:802
 msgid "Zoom"
 msgstr "Zooma"
 
-#: ../src/nautilus-zoom-control.c:807
+#: src/nautilus-zoom-control.c:808
 msgid "Set the zoom level of the current view"
 msgstr "Ställ in zoomnivån på den aktuella vyn"
 
-#: ../src/network-scheme.desktop.in.h:1
+#: src/network-scheme.desktop.in.h:1
 msgid "Network Servers"
 msgstr "Nätverksservrar"
 
-#: ../src/network-scheme.desktop.in.h:2
+#: src/network-scheme.desktop.in.h:2
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 
-#~ msgid "Move _Down"
-#~ msgstr "Flytta _ned"
-
-#~ msgid "Hide"
-#~ msgstr "Dölj"
-
-#~ msgid "_Use Default"
-#~ msgstr "_Använd standard"
-
-#~ msgid "%ld of %ld"
-#~ msgstr "%ld av %ld"
-
-#~ msgid "Create L_auncher"
-#~ msgstr "Skapa st_artare"
-
-#~ msgid "Open in new window"
-#~ msgstr "Öppna i nytt fönster"
-
-#~ msgid "File system"
-#~ msgstr "Filsystem"
-
-#~ msgid "Filesystem"
-#~ msgstr "Filsystem"
-
-#~ msgid "_Toolbar"
-#~ msgstr "_Verktygsrad"
-
-#~ msgid "Change the visibility of this window's toolbar"
-#~ msgstr "Ändra synligheten på detta fönsters verktygsrad"
-
-#~ msgid ""
-#~ "Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
-#~ "for preview"
-#~ msgstr ""
-#~ "Typ av bg_applier: BG_APPLIER_ROOT för rotfönstret eller "
-#~ "BG_APPLIER_PREVIEW för förhandsgranskning"
-
-#~ msgid "Preview Width"
-#~ msgstr "Bredd på förhandsvisning"
-
-#~ msgid "Width if applier is a preview: Defaults to 64."
-#~ msgstr "Bredd om verkställaren är en förhandsvisning: Standardvärdet är 64."
-
-#~ msgid "Preview Height"
-#~ msgstr "Höjd på förhandsvisning"
-
-#~ msgid "Height if applier is a preview: Defaults to 48."
-#~ msgstr "Höjd om verkställaren är en förhandsvisning: Standardvärdet är 48."
-
-#~ msgid "Screen"
-#~ msgstr "Skärm"
-
-#~ msgid "Screen on which BGApplier is to draw"
-#~ msgstr "Den skärm som BGApplier ska rita på"
-
-#~ msgid "Disabled"
-#~ msgstr "Inaktiverad"
-
-#~ msgid "Name of the column"
-#~ msgstr "Namn på kolumnen"
-
-#~ msgid "Attribute"
-#~ msgstr "Attribut"
-
-#~ msgid "The attribute name to display"
-#~ msgstr "Attributnamnet att visa"
-
-#~ msgid "Label"
-#~ msgstr "Etikett"
-
-#~ msgid "Label to display in the column"
-#~ msgstr "Etikett att visa i kolumnen"
-
-#~ msgid "A user-visible description of the column"
-#~ msgstr "En beskrivning av kolumnen som är synlig för användaren"
-
-#~ msgid "xalign"
-#~ msgstr "x-justering"
-
-#~ msgid "The x-alignment of the column"
-#~ msgstr "Justeringen i x-led för kolumnen"
-
-#~ msgid "Name of the item"
-#~ msgstr "Namn på objektet"
-
-#~ msgid "Label to display to the user"
-#~ msgstr "Etikett att visa för användaren"
-
-#~ msgid "Tip"
-#~ msgstr "Tips"
-
-#~ msgid "Tooltip for the menu item"
-#~ msgstr "Verktygstips för menyposten"
-
-#~ msgid "Icon"
-#~ msgstr "Ikon"
-
-#~ msgid "Name of the icon to display in the menu item"
-#~ msgstr "Namn på ikonen att visa i menyposten"
-
-#~ msgid "Sensitive"
-#~ msgstr "Känslig"
-
-#~ msgid "Whether the menu item is sensitive"
-#~ msgstr "Huruvida menyposten är käsnlig"
-
-#~ msgid "Priority"
-#~ msgstr "Prioritet"
-
-#~ msgid "Show priority text in toolbars"
-#~ msgstr "Visa prioritetstext i verktygsrader"
-
-#~ msgid "Name of the page"
-#~ msgstr "Namn på sidan"
-
-#~ msgid "Label widget to display in the notebook tab"
-#~ msgstr "Etikettwidget att visa i flikhäftesfliken"
-
-#~ msgid "Page"
-#~ msgstr "Sida"
-
-#~ msgid "Widget for the property page"
-#~ msgstr "Widget för egenskapssidan"
-
-#~ msgid "Bring up a new window for every opened file"
-#~ msgstr "Visa ett nytt fönster för varje öppnad fil"
-
-#~ msgid ""
-#~ "If set to true, then Nautilus will bring up a new Nautilus window by "
-#~ "default whenever an item is opened."
-#~ msgstr ""
-#~ "Om detta är sant visar Nautilus ett nytt Nautilusfönster som standard när "
-#~ "ett objekt öppnas."
-
-#~ msgid "Cut _Text"
-#~ msgstr "Klipp _ut text"
-
-#~ msgid "_Copy Text"
-#~ msgstr "K_opiera text"
-
-#~ msgid "_Paste Text"
-#~ msgstr "K_listra in text"
-
-#~ msgid "_Hide"
-#~ msgstr "_Dölj"
-
-#~ msgid "reset"
-#~ msgstr "återställ"
-
-#~ msgid "You cannot delete a volume icon."
-#~ msgstr "Du kan inte ta bort en volymikon."
-
-#~ msgid "Can't Delete Volume"
-#~ msgstr "Kan inte ta bort volym"
-
-#~ msgid "editable text"
-#~ msgstr "redigerbar text"
-
-#~ msgid "the editable label"
-#~ msgstr "den redigerbara etiketten"
-
-#~ msgid "additional text"
-#~ msgstr "ytterligare text"
-
-#~ msgid "some more text"
-#~ msgstr "mer text"
-
-#~ msgid "highlighted for selection"
-#~ msgstr "färgmarkerad för markering"
-
-#~ msgid "whether we are highlighted for a selection"
-#~ msgstr "huruvida vi är färgmarkerade för en markering"
-
-#~ msgid "highlighted as keyboard focus"
-#~ msgstr "färgmarkerad som tangentbordsfokus"
-
-#~ msgid "whether we are highlighted to render keyboard focus"
-#~ msgstr "huruvida vi är färgmarkerade för att rendera fokus"
-
-#~ msgid "highlighted for drop"
-#~ msgstr "färgmarkerad för släpp"
-
-#~ msgid "whether we are highlighted for a D&D drop"
-#~ msgstr "huruvida vi är färgmarkerade för ett drag-och-släpp"
-
-#~ msgid "Frame Text"
-#~ msgstr "Rama in text"
-
-#~ msgid "Draw a frame around unselected text"
-#~ msgstr "Rita en ram runt omarkerad text"
-
-#~ msgid "Selection Box Color"
-#~ msgstr "Färg på markeringsruta"
-
-#~ msgid "Color of the selection box"
-#~ msgstr "Färg på markeringsrutan"
-
-#~ msgid "Selection Box Alpha"
-#~ msgstr "Alfa för markeringsruta"
-
-#~ msgid "Opacity of the selection box"
-#~ msgstr "Opacitet för markeringsrutan"
-
-#~ msgid "Highlight Alpha"
-#~ msgstr "Färgmarkeringsalfa"
-
-#~ msgid "Opacity of the highlight for selected icons"
-#~ msgstr "Opacitet för färgmarkeringen för markerade ikoner"
-
-#~ msgid "Light Info Color"
-#~ msgstr "Ljus informationsfärg"
-
-#~ msgid "Color used for information text against a dark background"
-#~ msgstr "Färg som används för informationstext mot en mörk bakgrund"
-
-#~ msgid "Dark Info Color"
-#~ msgstr "Mörk informationsfärg"
-
-#~ msgid "Color used for information text against a light background"
-#~ msgstr "Färg som används för informationstext mot en ljus bakgrund"
-
-#~ msgid ""
-#~ "Do you want to switch to manual layout and leave this item where you "
-#~ "dropped it? This will clobber the stored manual layout."
-#~ msgstr ""
-#~ "Vill du byta till manuell layout och lämna objektet där du släppte det? "
-#~ "Detta kommer att skriva över den lagrade manuella layouten."
-
-#~ msgid "This folder uses automatic layout."
-#~ msgstr "Denna mapp använder automatisk layout."
-
-#~ msgid ""
-#~ "Do you want to switch to manual layout and leave these items where you "
-#~ "dropped them? This will clobber the stored manual layout."
-#~ msgstr ""
-#~ "Vill du byta till manuell layout och lämna dessa objekt där du släppte "
-#~ "dem? Detta kommer att skriva över den lagrade manuella layouten."
-
-#~ msgid ""
-#~ "Do you want to switch to manual layout and leave this item where you "
-#~ "dropped it?"
-#~ msgstr ""
-#~ "Vill du byta till manuell layout och lämna detta objekt där du släppte "
-#~ "det?"
-
-#~ msgid ""
-#~ "Do you want to switch to manual layout and leave these items where you "
-#~ "dropped them?"
-#~ msgstr ""
-#~ "Vill du byta till manuell layout och lämna dessa objekt där du släppte "
-#~ "dem?"
-
-#~ msgid "Open T_erminal"
-#~ msgstr "Öppna _terminalfönster"
-
-#~ msgid "Open a new GNOME terminal window"
-#~ msgstr "Öppna ett nytt GNOME-terminalfönster"
-
-#~ msgid "_Desktop"
-#~ msgstr "_Skrivbord"
-
-#~ msgid "Run or manage scripts from ~/.gnome2/nautilus-scripts"
-#~ msgstr "Kör eller hantera skript från ~/.gnome2/nautilus-scripts"
-
-#~ msgid "Cu_t Files"
-#~ msgstr "Klipp _ut filer"
-
-#~ msgid "_Copy Files"
-#~ msgstr "_Kopiera filer"
-
-#~ msgid "_Paste Files"
-#~ msgstr "Klistra _in filer"
-
-#~ msgid "Select _All Files"
-#~ msgstr "_Markera alla filer"
-
-# Passiv formulering?
-# http://bugzilla.gnome.org/show_bug.cgi?id=145306
-#~ msgid "Toggles the display of hidden files in the current window"
-#~ msgstr "Växlar visningen av dolda filer i det aktuella fönstret"
-
-#~ msgid "_Browse Folders"
-#~ msgstr "_Bläddra i mappar"
-
-#~ msgid "Ma_ke Links"
-#~ msgstr "Sk_apa länkar"
-
-#~ msgid "Cu_t File"
-#~ msgstr "Klipp _ut fil"
-
-#~ msgid "_Copy File"
-#~ msgstr "_Kopiera fil"
-
-#~ msgid "_Icons"
-#~ msgstr "_Ikoner"
-
-#~ msgid "_List"
-#~ msgstr "_Lista"
-
-#~ msgid "_Names:"
-#~ msgstr "_Namn:"
-
-#~ msgid "Open"
-#~ msgstr "Öppna"
-
-#~ msgid "Cut Folder"
-#~ msgstr "Klipp ut mapp"
-
-#~ msgid "Copy Folder"
-#~ msgstr "Kopiera mapp"
-
-#~ msgid "Paste Files into Folder"
-#~ msgstr "Klistra in filer i mapp"
-
-#~ msgid ""
-#~ "This is probably because the emblem is a permanent one, and not one you "
-#~ "added yourself."
-#~ msgstr ""
-#~ "Detta beror troligtvis på att emblemet är permanent och inte något du "
-#~ "lade till själv."
-
-#~ msgid "View as %s"
-#~ msgstr "Visa som %s"
-
-#~ msgid "Show %s"
-#~ msgstr "Visa %s"
-
-#~ msgid "The %s view encountered an error and can't continue."
-#~ msgstr "%s-vyn råkade ut för ett fel och kan inte fortsätta."
-
-#~ msgid "Application"
-#~ msgstr "Program"
-
-#~ msgid "The NautilusApplication associated with this window."
-#~ msgstr "Den NautilusApplication som är associerad med detta fönster."
-
 #~ msgid "_Network"
 #~ msgstr "_Nätverk"
 
@@ -6433,6 +6237,18 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Search List"
 #~ msgstr "Söklista"
 
+#~ msgid "View as Icons"
+#~ msgstr "Visa som ikoner"
+
+#~ msgid "View as List"
+#~ msgstr "Visa som lista"
+
+#~ msgid "View as _Icons"
+#~ msgstr "Visa som _ikoner"
+
+#~ msgid "View as _List"
+#~ msgstr "Visa som _lista"
+
 #~ msgid "Browse Folder"
 #~ msgstr "Bläddra i mapp"
 
@@ -6693,6 +6509,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Run or manage scripts from ~/Nautilus/skript"
 #~ msgstr "Kör eller hantera skript från ~/Nautilus/skript"
 
+#~ msgid "Run or manage scripts from %s"
+#~ msgstr "Kör eller hantera skript från %s"
+
 #~ msgid "Templates"
 #~ msgstr "Mallar"
 
@@ -6760,6 +6579,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Text view factory"
 #~ msgstr "Textvyfabrik"
 
+#~ msgid "View as Text"
+#~ msgstr "Visa som text"
+
 #~ msgid "animation to indicate on-going activity"
 #~ msgstr "animation som visar pågåenda aktivitet"
 
@@ -6851,6 +6673,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Forward"
 #~ msgstr "Framåt"
 
+#~ msgid "Home"
+#~ msgstr "Hem"
+
 #~ msgid "Reload"
 #~ msgstr "Läs om"
 
@@ -7295,6 +7120,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Show Hidden Files"
 #~ msgstr "Visa dolda filer"
 
+#~ msgid "Toggle the display of hidden files in the current window"
+#~ msgstr "Växla visningen av dolda filer i det aktuella fönstret"
+
 #~ msgid "<span weight=\"bold\">Behaviour</span>"
 #~ msgstr "<span weight=\"bold\">Beteende</span>"
 
@@ -7881,6 +7709,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Show"
 #~ msgstr "Visa"
 
+#~ msgid "Hide"
+#~ msgstr "Dölj"
+
 #~ msgid "Can't find an hbox, using a normal file selection"
 #~ msgstr "Kan inte hitta en hbox, använder normal filmarkering"
 
@@ -8001,6 +7832,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "*"
 #~ msgstr "*"
 
+#~ msgid "Reset"
+#~ msgstr "Återställ"
+
 #~ msgid "_Reset"
 #~ msgstr "_Återställ"
 
@@ -8343,6 +8177,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "A _Viewer..."
 #~ msgstr "En _visare..."
 
+#~ msgid "Open in %d New Windows"
+#~ msgstr "Öppna i %d nya fönster"
+
 #~ msgid "%d items, totalling %s"
 #~ msgstr "%d objekt, totalt %s"
 
@@ -8712,6 +8549,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "GÃ¥ till ickeexisterande plats"
 
+#~ msgid "Change the visibility of this window's toolbar"
+#~ msgstr "Ändra synligheten på detta fönsters verktygsrad"
+
 #~ msgid "Go to the Start Here folder"
 #~ msgstr "Gå till Börja här-mappen"
 
@@ -8721,6 +8561,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "_Start Here"
 #~ msgstr "B_örja här"
 
+#~ msgid "_Toolbar"
+#~ msgstr "_Verktygsrad"
+
 #~ msgid ""
 #~ "If set to true, Nautilus will show only show directories in the tree side "
 #~ "pane. Otherwise it will show both directories and files."
@@ -9244,6 +9087,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Rave"
 #~ msgstr "Rejv"
 
+#~ msgid "Showtunes"
+#~ msgstr "Showtunes"
+
 #~ msgid "Trailer"
 #~ msgstr "Trailer"
 
@@ -10064,6 +9910,9 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "_Make Link"
 #~ msgstr "S_kapa länk"
 
+#~ msgid "_Show Trash"
+#~ msgstr "_Visa papperskorgen"
+
 #~ msgid "Reversed Order"
 #~ msgstr "Omvänd ordning"
 
diff --git a/po/vi.po b/po/vi.po
index 983977ca0..86e12c3bc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Nautilus 2.12\n"
+"Project-Id-Version: Nautilus GNOME 2.12\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-08-04 06:46+0000\n"
-"PO-Revision-Date: 2005-09-16 17:16+0930\n"
+"PO-Revision-Date: 2005-08-27 17:25+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr "Bùn"
 
 #: ../data/browser.xml.h:56
 msgid "Multimedia"
-msgstr "�a vật chứa"
+msgstr "�a phương tiện"
 
 #: ../data/browser.xml.h:57
 msgid "New"
@@ -468,7 +468,7 @@ msgstr "Thứ tự cột mặc định trong khung xem danh sách."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
 msgid "Default folder viewer"
-msgstr "Bộ xem thư mục mặc định"
+msgstr "Bộ xem danh mục mặc định"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
 msgid "Default icon zoom level"
@@ -508,7 +508,7 @@ msgstr "Phông chữ màn hình n�n"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid "Desktop home icon name"
-msgstr "Tên biểu tượng thư mục cá nhân màn hình n�n"
+msgstr "Tên biểu tượng Danh mục cá nhân màn hình n�n"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Desktop trash icon name"
@@ -527,7 +527,7 @@ msgid ""
 "Filename for the default folder background. Only used if background_set is "
 "true."
 msgstr ""
-"Tên tập tin cho n�n thư mục mặc định. Chỉ được dùng nếu «background_set» là "
+"Tên tập tin cho n�n danh mục mặc định. Chỉ được dùng nếu «background_set» là "
 "đúng."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
@@ -545,22 +545,22 @@ msgid ""
 "massive folders. A negative value denotes no limit. The limit is approximate "
 "due to the reading of folders chunk-wise."
 msgstr ""
-"thư mục vượt quá kích thước này sẽ bị làm tròn thành kích thước này. Mục "
+"Danh mục vượt quá kích thước này sẽ bị làm tròn thành kích thước này. Mục "
 "đích của việc này là tránh bùng nổ mi�n nhớ bất ng� và làm Nautilus ngưng "
-"hoạt động vì những thư mục khổng lồ. Số âm nghĩa là không có giới hạn. Giới "
-"hạn này chỉ là xấp xỉ vì thư mục được đ�c theo từng đoạn."
+"hoạt động vì những danh mục khổng lồ. Số âm nghĩa là không có giới hạn. Giới "
+"hạn này chỉ là xấp xỉ vì danh mục được đ�c theo từng đoạn."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "Home icon visible on desktop"
-msgstr "Biểu tượng thư mục cá nhân hiện trên mặt bàn"
+msgstr "Biểu tượng danh mục cá nhân hiện trên mặt bàn"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
 msgstr ""
-"Nếu đặt là đúng, Nautilus sẽ chỉ hiển thị thư mục trong Khung l� dạng cây. "
-"Nếu không nó sẽ hiện cả thư mục và tập tin."
+"Nếu đặt là đúng, Nautilus sẽ chỉ hiển thị danh mục trong Khung l� dạng cây. "
+"Nếu không nó sẽ hiện cả danh mục và tập tin."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
@@ -600,7 +600,7 @@ msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
 msgstr ""
-"Nếu đặt là đúng, Nautilus hiện thư mục trước khi hiện tập tin trong Khung "
+"Nếu đặt là đúng, Nautilus hiện danh mục trước khi hiện tập tin trong Khung "
 "xem Biểu tượng và Khung xem Danh sách."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
@@ -629,8 +629,8 @@ msgid ""
 "If set to true, then Nautilus will use the user's home folder as the "
 "desktop. If it is false, then it will use ~/Desktop as the desktop."
 msgstr ""
-"Nếu đúng, Nautilus sẽ dùng thư mục cá nhân của ngư�i dùng làm mặt bàn. "
-"Ngược lại dùng thư mục <~/Desktop> làm mặt bàn."
+"Nếu đúng, Nautilus sẽ dùng danh mục cá nhân của ngư�i dùng làm mặt bàn. "
+"Ngược lại dùng danh mục <~/Desktop> làm mặt bàn."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
@@ -658,7 +658,7 @@ msgid ""
 msgstr ""
 "Nếu đặt là đúng, hiển thị các tập tin ẩn trong trình quản lý tập tin. Tập "
 "tin ẩn là những tập tin bắt đầu bằng dấu chấm, hoặc nhưng tập tin được liệt "
-"kê trong tập tin «.hidden» của thư mục đó."
+"kê trong tập tin «.hidden» của danh mục đó."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid ""
@@ -739,7 +739,7 @@ msgstr "Danh sách phụ đ� có thể dùng trên biểu tượng"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid "Maximum handled files in a folder"
-msgstr "Số tập tin tối đa được xử lý trong thư mục"
+msgstr "Số tập tin tối đa được xử lý trong danh mục"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid "Maximum image size for thumbnailing"
@@ -865,7 +865,7 @@ msgid ""
 "server. If set to \"local_only\" then only show counts for local file "
 "systems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
-"Thoả hiệp tốc độ khi hiện số mục trong một thư mục. Nếu đặt là « luôn luôn "
+"Thoả hiệp tốc độ khi hiện số mục trong một danh mục. Nếu đặt là « luôn luôn "
 "» thì luôn luôn đếm số mục, kể cả nếu tập tin ở trên máy ở xa. Nếu đặt « chỉ "
 "tập tin cục bộ » thì chỉ xem số đếm nếu nằm trên hệ thống tập tin _cục bộ_. "
 "Nếu đặt « không bao gi� » thì không bao gi� đếm."
@@ -973,13 +973,13 @@ msgid ""
 "another view for that particular folder. Possible values are \"list_view\" "
 "and \"icon_view\"."
 msgstr ""
-"Khi xem một thư mục, khung xem này sẽ được dùng, trừ khi bạn ch�n khung xem "
-"khác cho thư mục đặc biệt. Giá trị có thể là \"list_view\" (Khung xem Danh "
+"Khi xem một danh mục, khung xem này sẽ được dùng, trừ khi bạn ch�n khung xem "
+"khác cho danh mục đặc biệt. Giá trị có thể là \"list_view\" (Khung xem Danh "
 "sách) và \"icon_view\" (Khung xem Biểu tượng)."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:100
 msgid "When to show number of items in a folder"
-msgstr "Khi nào hiển thị số mục trong thư mục"
+msgstr "Khi nào hiển thị số mục trong danh mục"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:101
 msgid "When to show preview text in icons"
@@ -991,7 +991,7 @@ msgstr "Khi để hiển thị hình thu nh� của các tập tin ảnh"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:103
 msgid "Whether a custom default folder background has been set."
-msgstr "Có lập n�n thư mục mặc định tự ch�n hay không."
+msgstr "Có lập n�n danh mục mặc định tự ch�n hay không."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:104
 msgid "Whether a custom default side pane background has been set."
@@ -1206,7 +1206,7 @@ msgstr "Hủy b�"
 
 #: ../libnautilus-private/nautilus-dnd.c:705
 msgid "Set as background for _all folders"
-msgstr "�ặt làm n�n cho _m�i thư mục"
+msgstr "�ặt làm n�n cho _m�i danh mục"
 
 #: ../libnautilus-private/nautilus-dnd.c:710
 msgid "Set as background for _this folder"
@@ -1244,7 +1244,7 @@ msgstr ""
 #: ../libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
 msgid "Sorry, but there is already an emblem named \"%s\"."
-msgstr "Rất tiếc, đã có hình tượng tên là « %s »."
+msgstr "Rất tiếc, đã có hình tượng tên là « %s » rồi."
 
 #: ../libnautilus-private/nautilus-emblem-utils.c:214
 msgid "Please choose a different emblem name."
@@ -1318,7 +1318,7 @@ msgid ""
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Không thể xoá b� « %s » vì bạn không có thẩm quy�n để sửa đổi thư mục mẹ "
+"Không thể xoá b� « %s » vì bạn không có thẩm quy�n để sửa đổi danh mục mẹ "
 "của nó."
 
 #: ../libnautilus-private/nautilus-file-operations.c:597
@@ -1333,7 +1333,7 @@ msgid ""
 "its parent folder."
 msgstr ""
 "Không thể di chuyển « %s » được vì bạn không có thẩm quy�n để sửa đổi nó "
-"hoặc thư mục mẹ của nó."
+"hoặc danh mục mẹ của nó."
 
 #: ../libnautilus-private/nautilus-file-operations.c:633
 #, c-format
@@ -1341,7 +1341,7 @@ msgid ""
 "Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Không thể di chuyển « %s » được vì nó hoặc thư mục mẹ của nó được chứa "
+"Không thể di chuyển « %s » được vì nó hoặc danh mục mẹ của nó được chứa "
 "trong đích đến."
 
 #: ../libnautilus-private/nautilus-file-operations.c:643
@@ -1351,7 +1351,7 @@ msgid ""
 "change it or its parent folder."
 msgstr ""
 "Không thể b� « %s » vào s�t rác được vì bạn không có thẩm quy�n để sửa đổi "
-"nó hay thư mục mẹ của nó."
+"nó hay danh mục mẹ của nó."
 
 #: ../libnautilus-private/nautilus-file-operations.c:665
 msgid "Error while copying."
@@ -1522,7 +1522,7 @@ msgstr "Không thể thay thế tập tin"
 #: ../libnautilus-private/nautilus-file-operations.c:1100
 #, c-format
 msgid "The folder \"%s\" already exists.  Would you like to replace it?"
-msgstr "Thư mục « %s » đã tồn tại. Bạn có muốn thay thế nó không?"
+msgstr "Danh mục « %s » đã tồn tại. Bạn có muốn thay thế nó không?"
 
 #: ../libnautilus-private/nautilus-file-operations.c:1103
 #, c-format
@@ -1794,11 +1794,11 @@ msgstr "Tập tin và thư mục chỉ có thể di chuyển vào S�t rác."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2027
 msgid "You cannot move this trash folder."
-msgstr "Bạn không thể di chuyển thư mục s�t rác này."
+msgstr "Bạn không thể di chuyển danh mục s�t rác này."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2028
 msgid "You cannot copy this trash folder."
-msgstr "Bạn không thể sao chép thư mục s�t rác này."
+msgstr "Bạn không thể sao chép danh mục s�t rác này."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2029
 msgid "A trash folder is used for storing items moved to the trash."
@@ -1814,11 +1814,11 @@ msgstr "Không thể sao chép S�t rác"
 
 #: ../libnautilus-private/nautilus-file-operations.c:2056
 msgid "You cannot move a folder into itself."
-msgstr "Bạn không thể di chuyển một thư mục vào chính nó."
+msgstr "Bạn không thể di chuyển một danh mục vào chính nó."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2057
 msgid "You cannot copy a folder into itself."
-msgstr "Bạn không thể sao chép một thư mục vào trong chính nó."
+msgstr "Bạn không thể sao chép một danh mục vào trong chính nó."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2058
 msgid "The destination folder is inside the source folder."
@@ -1857,15 +1857,15 @@ msgstr "Không còn chỗ ở đích đến."
 #: ../libnautilus-private/nautilus-file-operations.c:2132
 #, c-format
 msgid "Error \"%s\" creating new folder."
-msgstr "Gặp lỗi « %s » khi tạo thư mục mới."
+msgstr "Gặp lỗi « %s » khi tạo danh mục mới."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2137
 msgid "Error creating new folder."
-msgstr "Gặp lỗi khi tạo thư mục mới."
+msgstr "Gặp lỗi khi tạo danh mục mới."
 
 #: ../libnautilus-private/nautilus-file-operations.c:2137
 msgid "Error Creating New Folder"
-msgstr "Gặp lỗi khi tạo thư mục mới"
+msgstr "Gặp lỗi khi tạo danh mục mới"
 
 #. localizers: the initial name of a new folder
 #: ../libnautilus-private/nautilus-file-operations.c:2232
@@ -2115,7 +2115,7 @@ msgstr[0] "%u mục"
 #, c-format
 msgid "%u folder"
 msgid_plural "%u folders"
-msgstr[0] "%u thư mục"
+msgstr[0] "%u danh mục"
 
 #: ../libnautilus-private/nautilus-file.c:4289
 #, c-format
@@ -2391,7 +2391,7 @@ msgstr "24"
 #: ../libnautilus-private/nautilus-global-preferences.c:506
 #, c-format
 msgid "%s's Home"
-msgstr "Thư mục của %s"
+msgstr "Chính %s"
 
 #: ../libnautilus-private/nautilus-icon-container.c:2112
 msgid "The selection rectangle"
@@ -2567,7 +2567,7 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:877
 msgid "This is disabled due to security considerations."
-msgstr "Hành động này đã tắt, bởi các lý do bảo mật."
+msgstr "Hành động này bị tắt, bởi các lý do bảo mật."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:878
 msgid "Can't Execute Remote Links"
@@ -2593,7 +2593,7 @@ msgid ""
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "�ể mở các tập tin không cục bộ, bạn hãy sao chép các tập tin này vào một "
-"thư mục cục bộ và sau đó thả chúng xuống một lần nữa."
+"danh mục cục bộ và sau đó thả chúng xuống một lần nữa."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:923
 #: ../libnautilus-private/nautilus-program-choosing.c:935
@@ -2643,11 +2643,11 @@ msgstr "Quản lý tập tin"
 
 #: ../nautilus-home.desktop.in.h:1 ../src/file-manager/fm-tree-view.c:1243
 msgid "Home Folder"
-msgstr "Thư mục chính"
+msgstr "Danh mục chính"
 
 #: ../nautilus-home.desktop.in.h:2
 msgid "View your home folder in the Nautilus file manager"
-msgstr "Xem thư mục chính của bạn trong trình quản lý tập tin Nautilus"
+msgstr "Xem danh mục chính của bạn trong trình quản lý tập tin Nautilus"
 
 #: ../nautilus.desktop.in.h:1
 msgid "Browse the file system with the file manager"
@@ -2813,7 +2813,7 @@ msgstr "« %s » được ch�n"
 #, c-format
 msgid "%d folder selected"
 msgid_plural "%d folders selected"
-msgstr[0] "%d thư mục đã ch�n"
+msgstr[0] "%d danh mục đã ch�n"
 
 #: ../src/file-manager/fm-directory-view.c:1877
 #, c-format
@@ -2872,7 +2872,7 @@ msgstr "%s%s, %s"
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
-"Thư mục « %s » chứa quá nhi�u tập tin hơn mà Nautilus không thể xử lý được. "
+"Danh mục « %s » chứa quá nhi�u tập tin hơn mà Nautilus không thể xử lý được. "
 
 #: ../src/file-manager/fm-directory-view.c:2038
 msgid "Some files will not be displayed."
@@ -2948,7 +2948,7 @@ msgstr "�ổ rác chứ?"
 #: ../src/file-manager/fm-directory-view.c:3917
 #, c-format
 msgid "Open with \"%s\""
-msgstr "Mở bằng « %s »"
+msgstr "Mở dùng « %s »"
 
 #: ../src/file-manager/fm-directory-view.c:3918
 #, c-format
@@ -3004,7 +3004,7 @@ msgstr ""
 "\n"
 "�ừng mở tập tin này trừ khi chính bạn đã tạo ra nó, hoặc nhận được nó từ "
 "nguồn đáng tin cậy. �ể mở tập tin, hãy đổi tên nó sang dạng mở rộng đúng cho "
-"« %s », sau đó mở tập tin bình thư�ng. Ngoài ra có thể dùng menu «Mở bằng» "
+"« %s », sau đó mở tập tin bình thư�ng. Ngoài ra có thể dùng menu «Mở dùng» "
 "để ch�n ứng dụng cụ thể để mở tập tin."
 
 #: ../src/file-manager/fm-directory-view.c:4822
@@ -3020,7 +3020,7 @@ msgstr "Tạo tài liệu theo mẫu « %s »"
 #: ../src/file-manager/fm-directory-view.c:5277
 msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr ""
-"Tất cả các tập tin thực thi trong thư mục này sẽ xuất hiện trên trình đơn "
+"Tất cả các tập tin thực thi trong danh mục này sẽ xuất hiện trên trình đơn "
 "Tập lệnh."
 
 #: ../src/file-manager/fm-directory-view.c:5279
@@ -3056,11 +3056,11 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
-"M�i tập tin có thể thực thi trong thư mục này sẽ xuất hiện trong trình đơn "
+"M�i tập tin có thể thực thi trong danh mục này sẽ xuất hiện trong trình đơn "
 "Tập lệnh. Việc ch�n một tập lệnh trong trình đơn thì sẽ chạy tập lệnh đó.\n"
 "\n"
-"Khi được thực thi từ thư mục cục bộ, các tập lệnh sẽ nhận những tên các tập "
-"tin được ch�n. Khi được thực thi từ thư mục ở xa (v.d.: thư mục hiển thị "
+"Khi được thực thi từ danh mục cục bộ, các tập lệnh sẽ nhận những tên các tập "
+"tin được ch�n. Khi được thực thi từ danh mục ở xa (v.d.: danh mục hiển thị "
 "nội dung http hay ftp), các tập lệnh sẽ không nhận tham số nào.\n"
 "\n"
 "Trong m�i trư�ng hợp, Nautilus sẽ lập các biến môi trư�ng sau đây, để các "
@@ -3163,12 +3163,12 @@ msgstr "Xem hoặc sá»­a đổi các tính chất của má»—i mục được chá
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6105
 msgid "View or modify the properties of the open folder"
-msgstr "Xem hoặc sửa đổi các thuộc tính của thư mục đang mở"
+msgstr "Xem hoặc sửa đổi các thuộc tính của danh mục đang mở"
 
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6108
 msgid "Create _Folder"
-msgstr "Tạo _thư mục"
+msgstr "Tạo _Danh mục"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6109
@@ -3220,7 +3220,7 @@ msgstr "Mở mỗi mục được ch�n trong cửa sổ duyệt"
 #: ../src/file-manager/fm-directory-view.c:6134
 #: ../src/file-manager/fm-directory-view.c:6138
 msgid "Open with Other _Application..."
-msgstr "Mở bằng Ứng dụng _khác..."
+msgstr "Mở dùng Ứng dụng _khác..."
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6135
@@ -3231,12 +3231,12 @@ msgstr "Ch�n ứng dụng khác để mở mục đã ch�n"
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6142
 msgid "_Open Scripts Folder"
-msgstr "_Mở thư mục Tập lệnh"
+msgstr "_Mở danh mục Tập lệnh"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6143
 msgid "Show the folder containing the scripts that appear in this menu"
-msgstr "Trình diễn thư mục mà chứa các tập lệnh xuất hiện trong trình đơn này"
+msgstr "Trình diễn danh mục mà chứa các tập lệnh xuất hiện trong trình đơn này"
 
 #. name, stock id
 #. label, accelerator
@@ -3264,7 +3264,7 @@ msgstr ""
 #: ../src/file-manager/fm-directory-view.c:6164
 #: ../src/file-manager/fm-tree-view.c:1163
 msgid "_Paste Into Folder"
-msgstr "_Dán vào thư mục"
+msgstr "_Dán vào danh mục"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6165
@@ -3273,7 +3273,7 @@ msgid ""
 "selected folder"
 msgstr ""
 "Di chuyển hoặc sao chép các tập tin, đã được ch�n truớc đó bằng lệnh «Cắt» "
-"hoặc «Chép», vào thư mục được ch�n"
+"hoặc «Chép», vào danh mục được ch�n"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6169
@@ -3410,29 +3410,29 @@ msgstr "Mở tập tin và đóng cửa sổ"
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6227
 msgid "Open this folder in a navigation window"
-msgstr "Mở thư mục này trong cửa sổ duyệt"
+msgstr "Mở danh mục này trong cửa sổ duyệt"
 
 #. name, stock id
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6232
 msgid "Prepare this folder to be moved with a Paste command"
-msgstr "Chuẩn bị thư mục này để được di chuyển dùng lệnh «Dán»"
+msgstr "Chuẩn bị danh mục này để được di chuyển dùng lệnh «Dán»"
 
 #. name, stock id
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6236
 msgid "Prepare this folder to be copied with a Paste command"
-msgstr "Chuẩn bị thư mục này để được sao chép dùng lệnh «Dán»"
+msgstr "Chuẩn bị danh mục này để được sao chép dùng lệnh «Dán»"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6241
 msgid "Move this folder to the Trash"
-msgstr "Di chuyển thư mục này vào S�t rác"
+msgstr "Di chuyển danh mục này vào S�t rác"
 
 #. label, accelerator
 #: ../src/file-manager/fm-directory-view.c:6245
 msgid "Delete this folder, without moving to the Trash"
-msgstr "Xóa b� thư mục này mà không b� vào s�t rác"
+msgstr "Xóa b� danh mục này mà không b� vào s�t rác"
 
 #. name, stock id
 #: ../src/file-manager/fm-directory-view.c:6251
@@ -3466,7 +3466,7 @@ msgstr "Mở trong cửa sổ mới"
 #: ../src/file-manager/fm-directory-view.c:6736
 msgid "_Browse Folder"
 msgid_plural "_Browse Folders"
-msgstr[0] "_Duyệt thư mục"
+msgstr[0] "_Duyệt danh mục"
 
 #: ../src/file-manager/fm-directory-view.c:6592
 #: ../src/file-manager/fm-directory-view.c:6756
@@ -3475,16 +3475,16 @@ msgstr "_Xóa b� kh�i s�t rác"
 
 #: ../src/file-manager/fm-directory-view.c:6593
 msgid "Delete the open folder permanently"
-msgstr "Xóa b� vĩnh viễn thư mục đang mở"
+msgstr "Xóa b� vĩnh viễn danh mục đang mở"
 
 #: ../src/file-manager/fm-directory-view.c:6597
 msgid "Move the open folder to the Trash"
-msgstr "Di chuyển thư mục đang mở vào S�t rác"
+msgstr "Di chuyển danh mục đang mở vào S�t rác"
 
 #: ../src/file-manager/fm-directory-view.c:6708
 #, c-format
 msgid "_Open with \"%s\""
-msgstr "_Mở bằng « %s »"
+msgstr "_Mở dùng « %s »"
 
 #: ../src/file-manager/fm-directory-view.c:6730
 #, c-format
@@ -3604,24 +3604,24 @@ msgstr "Rất tiếc, không thể hiển thị toàn bộ nội dung của « %
 
 #: ../src/file-manager/fm-error-reporting.c:71
 msgid "The folder contents could not be displayed."
-msgstr "Không thể hiển thị nội dung thư mục."
+msgstr "Không thể hiển thị nội dung danh mục."
 
 #: ../src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
-msgstr "Gặp lỗi khi hiển thị thư mục"
+msgstr "Gặp lỗi khi hiển thị danh mục"
 
 #: ../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 "Tên « %s » đã được dùng trong thư mục này. Hãy dùng một tên khác."
+msgstr "Tên « %s » đã được dùng trong danh mục này. Hãy dùng một tên khác."
 
 #: ../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 ""
-"Không có « %s » ở trong thư mục này. Có thể nó vừa bị chuyển hoặc xóa đi "
+"Không có « %s » ở trong danh mục này. Có thể nó vừa bị chuyển hoặc xóa đi "
 "không?"
 
 #: ../src/file-manager/fm-error-reporting.c:113
@@ -3866,7 +3866,7 @@ msgstr "Theo _loại"
 
 #: ../src/file-manager/fm-icon-view.c:1448
 msgid "By Modification _Date"
-msgstr "Theo ngày thay đổ_i"
+msgstr "Theo ngày thay _đổi"
 
 #: ../src/file-manager/fm-icon-view.c:1452
 msgid "By _Emblems"
@@ -4219,7 +4219,7 @@ msgstr "Không thể hiển thị Trợ giúp"
 
 #: ../src/file-manager/fm-properties-window.c:3366
 msgid "Open With"
-msgstr "Mở bằng"
+msgstr "Mở dùng"
 
 #: ../src/file-manager/fm-properties-window.c:3704
 msgid "Cancel Showing Properties Window?"
@@ -4240,7 +4240,7 @@ msgstr "�ẩy _ra"
 #. add the "create folder" menu item
 #: ../src/file-manager/fm-tree-view.c:1129
 msgid "Create Folder"
-msgstr "Tạo thư mục"
+msgstr "Tạo danh mục"
 
 #: ../src/file-manager/fm-tree-view.c:1181
 msgid "Move to Trash"
@@ -4270,14 +4270,14 @@ msgstr "Không thể tạo thư mục theo yêu cầu"
 #: ../src/nautilus-application.c:258
 #, c-format
 msgid "Nautilus could not create the required folder \"%s\"."
-msgstr "Nautilus không thể tạo thư mục « %s » theo yêu cầu."
+msgstr "Nautilus không thể tạo danh mục « %s » theo yêu cầu."
 
 #: ../src/nautilus-application.c:260
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
 msgstr ""
-"Trước khi chạy Nautilus, bạn hãy tạo thư mục sau, hoặc đặt quy�n để "
+"Trước khi chạy Nautilus, bạn hãy tạo danh mục sau, hoặc đặt quy�n để "
 "Nautilus có thể tạo nó."
 
 #: ../src/nautilus-application.c:263
@@ -4287,14 +4287,14 @@ msgstr "Không thể tạo các thư mục theo yêu cầu"
 #: ../src/nautilus-application.c:264
 #, c-format
 msgid "Nautilus could not create the following required folders: %s."
-msgstr "Nautilus không thể tạo những thư mục cần thiết sau: %s."
+msgstr "Nautilus không thể tạo những danh mục cần thiết sau: %s."
 
 #: ../src/nautilus-application.c:266
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Trước khi chạy Nautilus, hãy tạo các thư mục này, hoặc lập quy�n để "
+"Trước khi chạy Nautilus, hãy tạo các danh mục này, hoặc lập quy�n để "
 "Nautilus có thể tạo chúng."
 
 #: ../src/nautilus-application.c:334
@@ -4311,7 +4311,7 @@ msgid ""
 "The location of the desktop directory has changed in GNOME 2.4. You can open "
 "the link and move over the files you want, then delete the link."
 msgstr ""
-"Vị trí của thư mục của mặt bàn đã thay đổi trong GNOME phiên bản 2.4. "
+"Vị trí của danh mục của mặt bàn đã thay đổi trong GNOME phiên bản 2.4. "
 "Bạn có thể mở liên kết này để di chuyển nhưng tập tin qua màn hình n�n mới, "
 "sau đó xóa b� liên kết đi."
 
@@ -4491,7 +4491,7 @@ msgstr "_Cổng:"
 
 #: ../src/nautilus-connect-server-dialog.c:529
 msgid "_Folder:"
-msgstr "_thư mục:"
+msgstr "_Danh mục:"
 
 #: ../src/nautilus-connect-server-dialog.c:549
 msgid "_User Name:"
@@ -4688,7 +4688,7 @@ msgstr "<span weight=\"bold\">Tập tin văn bản thực thi được</span>"
 
 #: ../src/nautilus-file-management-properties.glade.h:28
 msgid "<span weight=\"bold\">Folders</span>"
-msgstr "<span weight=\"bold\">thư mục</span>"
+msgstr "<span weight=\"bold\">Danh mục</span>"
 
 #: ../src/nautilus-file-management-properties.glade.h:29
 msgid "<span weight=\"bold\">Icon Captions</span>"
@@ -4800,7 +4800,7 @@ msgstr "Nghe thử tập tin â_m thanh:"
 
 #: ../src/nautilus-file-management-properties.glade.h:62
 msgid "Show _only folders"
-msgstr "_Chỉ hiển thị thư mục"
+msgstr "_Chỉ hiển thị danh mục"
 
 #: ../src/nautilus-file-management-properties.glade.h:63
 msgid "Show _thumbnails:"
@@ -5035,7 +5035,7 @@ msgstr "Bạn có thể dùng ảnh chỉ làm biểu tượng riêng mà thôi.
 #: ../src/nautilus-information-panel.c:898
 #, c-format
 msgid "Open with %s"
-msgstr "Mở bằng %s"
+msgstr "Mở dùng %s"
 
 #: ../src/nautilus-information-panel.c:993
 msgid "Unable to launch the cd burner application."
@@ -5225,7 +5225,7 @@ msgstr "_Xóa lịch sử"
 #. name, stock id, label
 #: ../src/nautilus-navigation-window-menus.c:428
 msgid "Clear contents of Go menu and Back/Forward lists"
-msgstr "Xóa nội dung trong thư mục �i và danh sách «Lùi/Tới»"
+msgstr "Xóa nội dung trong danh mục �i và danh sách «Lùi/Tới»"
 
 #: ../src/nautilus-navigation-window-menus.c:430
 #: ../src/nautilus-spatial-window.c:738
@@ -5556,21 +5556,21 @@ msgstr "Mở �ị_a chỉ..."
 
 #: ../src/nautilus-spatial-window.c:732
 msgid "Close P_arent Folders"
-msgstr "�óng thư mục _mẹ"
+msgstr "�óng danh mục _mẹ"
 
 #. name, stock id, label
 #: ../src/nautilus-spatial-window.c:733
 msgid "Close this folder's parents"
-msgstr "�óng các thư mục mẹ của thư mục này"
+msgstr "�óng các danh mục mẹ của danh mục này"
 
 #: ../src/nautilus-spatial-window.c:735
 msgid "Clos_e All Folders"
-msgstr "�óng m�_i thư mục"
+msgstr "�óng m�_i danh mục"
 
 #. name, stock id, label
 #: ../src/nautilus-spatial-window.c:736
 msgid "Close all folder windows"
-msgstr "�óng m�i cửa sổ thư mục"
+msgstr "�óng m�i cửa sổ danh mục"
 
 #: ../src/nautilus-throbber.c:514
 msgid "throbber"
@@ -5616,11 +5616,11 @@ msgstr "Xem thư mục hiện th�i"
 #: ../src/nautilus-window-manage-views.c:1361
 msgid "Nautilus has no installed viewer capable of displaying the folder."
 msgstr ""
-"Nautilus chưa được cài đặt bộ quan sát để có thể hiển thị thư mục này."
+"Nautilus chưa được cài đặt bộ quan sát để có thể hiển thị danh mục này."
 
 #: ../src/nautilus-window-manage-views.c:1367
 msgid "The location is not a folder."
-msgstr "�ịa chỉ này không phải là thư mục."
+msgstr "�ịa chỉ này không phải là danh mục."
 
 #: ../src/nautilus-window-manage-views.c:1394
 #, c-format
@@ -5733,7 +5733,7 @@ msgstr "Trợ _giúp"
 #. name, stock id
 #: ../src/nautilus-window-menus.c:600
 msgid "_Close"
-msgstr "_�óng"
+msgstr "�ón_g"
 
 #. label, accelerator
 #: ../src/nautilus-window-menus.c:601
@@ -5769,12 +5769,12 @@ msgstr "Hồi phục lại sự sửa đổi văn bản lần cuối"
 
 #: ../src/nautilus-window-menus.c:614
 msgid "Open _Parent"
-msgstr "Mở thư mục _mẹ"
+msgstr "Mở danh mục _mẹ"
 
 #. name, stock id, label
 #: ../src/nautilus-window-menus.c:615
 msgid "Open the parent folder"
-msgstr "Mở thư mục mẹ"
+msgstr "Mở danh mục mẹ"
 
 #. name, stock id
 #: ../src/nautilus-window-menus.c:621
@@ -5849,12 +5849,12 @@ msgstr "Tạo kết nối đến một máy phục vụ mạng"
 #. name, stock id
 #: ../src/nautilus-window-menus.c:665
 msgid "_Home"
-msgstr "_thư mục chính"
+msgstr "_Danh mục chính"
 
 #. label, accelerator
 #: ../src/nautilus-window-menus.c:666
 msgid "Go to the home folder"
-msgstr "V� thư mục chính"
+msgstr "V� danh mục chính"
 
 #. name, stock id
 #: ../src/nautilus-window-menus.c:669
diff --git a/src/Makefile.am b/src/Makefile.am
index 3e19e7b5a..8be8aa971 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,6 +99,8 @@ nautilus_SOURCES = \
 	nautilus-places-sidebar.h		\
 	nautilus-property-browser.c     	\
 	nautilus-property-browser.h		\
+	nautilus-search-bar.c			\
+	nautilus-search-bar.h			\
 	nautilus-self-check-functions.c 	\
 	nautilus-self-check-functions.h 	\
 	nautilus-shell.c			\
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index e954a5ca7..3d36edf9d 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -88,6 +88,7 @@
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-icon-factory.h>
 #include <libnautilus-private/nautilus-link.h>
+#include <libnautilus-private/nautilus-marshal.h>
 #include <libnautilus-private/nautilus-metadata.h>
 #include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-module.h>
@@ -253,6 +254,8 @@ struct FMDirectoryViewDetails
 	guint open_with_merge_id;
 
 	GList *subdirectory_list;
+
+	gboolean allow_moves;
 };
 
 typedef enum {
@@ -1983,6 +1986,12 @@ fm_directory_view_send_selection_change (FMDirectoryView *view)
 	view->details->send_selection_change_to_shell = FALSE;
 }
 
+gboolean
+fm_directory_view_get_allow_moves (FMDirectoryView *view)
+{
+	return view->details->allow_moves;
+}
+
 static void
 fm_directory_view_load_location (NautilusView *nautilus_view,
 				 const char *location)
@@ -1992,6 +2001,12 @@ fm_directory_view_load_location (NautilusView *nautilus_view,
 
 	directory_view = FM_DIRECTORY_VIEW (nautilus_view);
 
+	if (eel_uri_is_search (location)) {
+		directory_view->details->allow_moves = FALSE;
+	} else {
+		directory_view->details->allow_moves = TRUE;
+	}
+
 	directory = nautilus_directory_get (location);
 	load_directory (directory_view, directory);
 	nautilus_directory_unref (directory);
@@ -2712,6 +2727,7 @@ done_loading_callback (NautilusDirectory *directory,
 static void
 load_error_callback (NautilusDirectory *directory,
 		     GnomeVFSResult load_error_code,
+		     const char *load_error_message,
 		     gpointer callback_data)
 {
 	FMDirectoryView *view;
@@ -2727,11 +2743,11 @@ load_error_callback (NautilusDirectory *directory,
 	 * occurred, so they can handle it in the UI.
 	 */
 	g_signal_emit (view,
-			 signals[LOAD_ERROR], 0, load_error_code);
+		       signals[LOAD_ERROR], 0, load_error_code, load_error_message);
 }
 
 static void
-real_load_error (FMDirectoryView *view, GnomeVFSResult result)
+real_load_error (FMDirectoryView *view, GnomeVFSResult result, const char *error_message)
 {
 	g_assert (result != GNOME_VFS_OK);
 
@@ -2744,7 +2760,7 @@ real_load_error (FMDirectoryView *view, GnomeVFSResult result)
 	if (!view->details->reported_load_error) {
 		fm_report_error_loading_directory 
 			(fm_directory_view_get_directory_as_file (view), 
-			 result,
+			 result, error_message,
 			 fm_directory_view_get_containing_window (view));
 	}
 	view->details->reported_load_error = TRUE;
@@ -4556,9 +4572,52 @@ add_extension_menu_items (FMDirectoryView *view,
 	}
 }
 
+static gboolean
+has_file_in_list (GList *list, NautilusFile *file)
+{
+	gboolean ret = FALSE;
+	char *mime;
+       
+	mime = nautilus_file_get_mime_type (file);
+	
+	for (; list; list = list->next) {
+		NautilusFile *tmp_file = list->data;
+		char *tmp_mime = nautilus_file_get_mime_type (tmp_file);
+
+		if (strcmp (tmp_mime, mime) == 0) {
+			ret = TRUE;
+			g_free (tmp_mime);
+			break;
+		}
+
+		g_free (tmp_mime);
+	}
+	
+	g_free (mime);
+	return ret;
+}
+
+static GList *
+get_unique_files (GList *selection)
+{
+	GList *result;
+
+	result = NULL;
+	for (; selection; selection = selection->next) {
+		if (!has_file_in_list (result,
+				       NAUTILUS_FILE (selection->data))) {
+			result = g_list_prepend (result, selection->data);
+		}
+	}	
+
+	return g_list_reverse (result);
+}
+
+
 static void
 reset_extension_actions_menu (FMDirectoryView *view, GList *selection)
 {
+	GList *unique_selection;
 	GList *items;
 	GList *l;
 	GtkUIManager *ui_manager;
@@ -4575,17 +4634,22 @@ reset_extension_actions_menu (FMDirectoryView *view, GList *selection)
 				      &view->details->extensions_menu_merge_id,
 				      &view->details->extensions_menu_action_group);
 
+	/* only query for the unique files */
+	unique_selection = get_unique_files (selection);
 	items = get_all_extension_menu_items (gtk_widget_get_toplevel (GTK_WIDGET (view)), 
 					      selection);
-	if (items != NULL) {
-		add_extension_menu_items (view, selection, items);
-
+	
+	if (items) {
+		add_extension_menu_items (view, unique_selection, items);
+	
 		for (l = items; l != NULL; l = l->next) {
 			g_object_unref (l->data);
 		}
-
+		
 		g_list_free (items);
 	}
+
+	g_list_free (unique_selection);
 }
 
 static char *
@@ -6277,12 +6341,11 @@ connect_proxy (FMDirectoryView *view,
 						   "gnome-fs-regular",
 						   NAUTILUS_ICON_SIZE_FOR_MENUS,
 						   0, NULL);
-		if (pixbuf != NULL) {
-			image = gtk_image_new_from_pixbuf (pixbuf);
-			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
 
-			gdk_pixbuf_unref (pixbuf);
-		}
+		image = gtk_image_new_from_pixbuf (pixbuf);
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
+
+		gdk_pixbuf_unref (pixbuf);
 	}
 }
 
@@ -7961,11 +8024,29 @@ fm_directory_view_is_empty (FMDirectoryView *view)
 		 is_empty, (view));
 }
 
+gboolean
+fm_directory_view_is_editable (FMDirectoryView *view)
+{
+	NautilusDirectory *directory;
+
+	directory = fm_directory_view_get_model (view);
+
+	if (directory != NULL) {
+		return nautilus_directory_is_editable (directory);
+	}
+
+	return TRUE;
+}
+
 static gboolean
 real_is_read_only (FMDirectoryView *view)
 {
 	NautilusFile *file;
-
+	
+	if (!fm_directory_view_is_editable (view)) {
+		return TRUE;
+	}
+	
 	file = fm_directory_view_get_directory_as_file (view);
 	if (file != NULL) {
 		return !nautilus_file_can_write (file);
@@ -8020,7 +8101,7 @@ real_accepts_dragged_files (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE);
 
-	return TRUE;
+	return !fm_directory_view_is_read_only (view);
 }
 
 gboolean
@@ -8796,8 +8877,8 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (FMDirectoryViewClass, load_error),
 		              NULL, NULL,
-		              g_cclosure_marshal_VOID__INT,
-		              G_TYPE_NONE, 1, G_TYPE_INT);
+		              nautilus_marshal_VOID__INT_STRING,
+		              G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING);
 	signals[REMOVE_FILE] =
 		g_signal_new ("remove_file",
 		              G_TYPE_FROM_CLASS (klass),
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index ca12b75ec..5ba694286 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -118,7 +118,8 @@ struct FMDirectoryViewClass {
 	 * load failures like ACCESS_DENIED.
 	 */
 	void    (* load_error)           (FMDirectoryView *view,
-					  GnomeVFSResult result);
+					  GnomeVFSResult result,
+					  const char *error_message);
 
 	/* Function pointers that don't have corresponding signals */
 
@@ -374,6 +375,7 @@ NautilusDirectory  *fm_directory_view_get_model                        (FMDirect
 GtkWindow	   *fm_directory_view_get_containing_window	       (FMDirectoryView  *view);
 NautilusFile       *fm_directory_view_get_directory_as_file            (FMDirectoryView  *view);
 EelBackground *     fm_directory_view_get_background                   (FMDirectoryView  *view);
+gboolean            fm_directory_view_get_allow_moves                  (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,
@@ -412,4 +414,6 @@ void                fm_directory_view_add_subdirectory                (FMDirecto
 void                fm_directory_view_remove_subdirectory             (FMDirectoryView  *view,
 									NautilusDirectory*directory);
 
+gboolean            fm_directory_view_is_editable                     (FMDirectoryView *view);
+
 #endif /* FM_DIRECTORY_VIEW_H */
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index 09d22c33e..332e9ee90 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -41,31 +41,36 @@ static void cancel_rename (NautilusFile *file);
 void
 fm_report_error_loading_directory (NautilusFile *file,
 			           GnomeVFSResult error,
+				   const char *error_message,
 			           GtkWindow *parent_window)
 {
 	char *file_name;
 	char *message;
 
-	if (error == GNOME_VFS_OK) {
+	if (error_message == NULL && error == GNOME_VFS_OK) {
 		return;
 	}
 
 	file_name = nautilus_file_get_display_name (file);
 
-	switch (error) {
-	case GNOME_VFS_ERROR_ACCESS_DENIED:
-		message = g_strdup_printf (_("You do not have the permissions necessary to view the contents of \"%s\"."),
-					   file_name);
-		break;
-	case GNOME_VFS_ERROR_NOT_FOUND:
-		message = g_strdup_printf (_("\"%s\" couldn't be found. Perhaps it has recently been deleted."),
-					   file_name);
-		break;
-	default:
-		/* We should invent decent error messages for every case we actually experience. */
-		g_warning ("Hit unhandled case %d (%s) in fm_report_error_loading_directory", 
-			   error, gnome_vfs_result_to_string (error));
-		message = g_strdup_printf (_("Sorry, couldn't display all the contents of \"%s\"."), file_name);
+	if (!error_message) {
+		switch (error) {
+		case GNOME_VFS_ERROR_ACCESS_DENIED:
+			message = g_strdup_printf (_("You do not have the permissions necessary to view the contents of \"%s\"."),
+						   file_name);
+			break;
+		case GNOME_VFS_ERROR_NOT_FOUND:
+			message = g_strdup_printf (_("\"%s\" couldn't be found. Perhaps it has recently been deleted."),
+						   file_name);
+			break;
+		default:
+			/* We should invent decent error messages for every case we actually experience. */
+			g_warning ("Hit unhandled case %d (%s) in fm_report_error_loading_directory", 
+				   error, gnome_vfs_result_to_string (error));
+			message = g_strdup_printf (_("Sorry, couldn't display all the contents of \"%s\"."), file_name);
+		}
+	} else {
+		message = g_strdup (error_message);
 	}
 
 	eel_show_error_dialog (_("The folder contents could not be displayed."), message, 
diff --git a/src/file-manager/fm-error-reporting.h b/src/file-manager/fm-error-reporting.h
index a1b44bf66..a4665a3fb 100644
--- a/src/file-manager/fm-error-reporting.h
+++ b/src/file-manager/fm-error-reporting.h
@@ -32,6 +32,7 @@
 
 void fm_report_error_loading_directory	 (NautilusFile   *file,
 					  GnomeVFSResult  error_code,
+					  const char     *error_message,
 					  GtkWindow	 *parent_window);
 void fm_report_error_renaming_file       (NautilusFile   *file,
 					  const char     *new_name,
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 0f9fb6d67..ebe5cb7e4 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -71,7 +71,6 @@
 #include <libnautilus-private/nautilus-metadata.h>
 #include <libnautilus-private/nautilus-view-factory.h>
 #include <libnautilus-private/nautilus-clipboard.h>
-#include <libnautilus-private/nautilus-desktop-icon-file.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdio.h>
@@ -536,8 +535,7 @@ fm_icon_view_add_file (FMDirectoryView *view, NautilusFile *file)
 	}
 	
 	if (nautilus_icon_container_add (icon_container,
-					 NAUTILUS_ICON_CONTAINER_ICON_DATA (file),
-					 NAUTILUS_IS_DESKTOP_ICON_FILE (file))) {
+					 NAUTILUS_ICON_CONTAINER_ICON_DATA (file))) {
 		nautilus_file_ref (file);
 	}
 }
@@ -1055,6 +1053,9 @@ fm_icon_view_begin_loading (FMDirectoryView *view)
 	file = fm_directory_view_get_directory_as_file (view);
 	icon_container = GTK_WIDGET (get_icon_container (icon_view));
 
+	nautilus_icon_container_set_allow_moves (NAUTILUS_ICON_CONTAINER (icon_container),
+						 fm_directory_view_get_allow_moves (view));
+
 	/* kill any sound preview process that is ongoing */
 	preview_audio (icon_view, NULL, FALSE);
 
@@ -1533,6 +1534,7 @@ fm_icon_view_update_menus (FMDirectoryView *view)
         int selection_count;
 	GtkAction *action;
         NautilusIconContainer *icon_container;
+	gboolean editable;
 
         icon_view = FM_ICON_VIEW (view);
 
@@ -1559,8 +1561,13 @@ fm_icon_view_update_menus (FMDirectoryView *view)
 	gtk_action_set_sensitive (action,
 				  icon_container != NULL
 				  && nautilus_icon_container_is_stretched (icon_container));
-	
+
 	nautilus_file_list_free (selection);
+
+	editable = fm_directory_view_is_editable (view);
+	action = gtk_action_group_get_action (icon_view->details->icon_action_group,
+					      FM_ACTION_MANUAL_LAYOUT);
+	gtk_action_set_sensitive (action, editable);
 }
 
 static void
@@ -2029,8 +2036,7 @@ fm_icon_view_screen_changed (GtkWidget *widget,
 				fm_icon_view_remove_file (view, file);
 			} else {
 				if (nautilus_icon_container_add (icon_container,
-								 NAUTILUS_ICON_CONTAINER_ICON_DATA (file),
-								 NAUTILUS_IS_DESKTOP_ICON_FILE (file))) {
+								 NAUTILUS_ICON_CONTAINER_ICON_DATA (file))) {
 					nautilus_file_ref (file);
 				}
 			}
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 8d8f9669c..217683eb4 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -406,34 +406,6 @@ get_drag_pixbuf (FMListView *view)
 	return ret;
 }
 
-static void
-drag_begin_callback (GtkWidget *widget,
-		     GdkDragContext *context,
-		     FMListView *view)
-{
-	GList *ref_list;
-	GdkPixbuf *pixbuf;
-
-	pixbuf = get_drag_pixbuf (view);
-	if (pixbuf) {
-		gtk_drag_set_icon_pixbuf (context,
-					  pixbuf,
-					  0, 0);
-		g_object_unref (pixbuf);
-	} else {
-		gtk_drag_set_icon_default (context);
-	}
-
-	stop_drag_check (view);
-	view->details->drag_started = TRUE;
-	
-	ref_list = get_filtered_selection_refs (GTK_TREE_VIEW (widget));
-	g_object_set_data_full (G_OBJECT (context),
-				"drag-info",
-				ref_list,
-				(GDestroyNotify)ref_list_free);
-}
-
 static gboolean
 motion_notify_callback (GtkWidget *widget,
 			GdkEventMotion *event,
@@ -442,6 +414,8 @@ motion_notify_callback (GtkWidget *widget,
 	FMListView *view;
 	GdkDragContext *context;
 	GdkCursor *cursor;
+	GList *ref_list;
+	GdkPixbuf *pixbuf;	
 	GtkTreePath *last_hover_path;
 	GtkTreeIter iter;
 	
@@ -502,6 +476,25 @@ motion_notify_callback (GtkWidget *widget,
 				 GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK,
 				 view->details->drag_button,
 				 (GdkEvent*)event);
+
+			stop_drag_check (view);
+			view->details->drag_started = TRUE;
+			
+			ref_list = get_filtered_selection_refs (GTK_TREE_VIEW (widget));
+			g_object_set_data_full (G_OBJECT (context),
+						"drag-info",
+						ref_list,
+						(GDestroyNotify)ref_list_free);
+
+			pixbuf = get_drag_pixbuf (view);
+			if (pixbuf) {
+				gtk_drag_set_icon_pixbuf (context,
+							  pixbuf,
+							  0, 0);
+				g_object_unref (pixbuf);
+			} else {
+				gtk_drag_set_icon_default (context);
+			}
 		}		      
 		return TRUE;
 	}
@@ -1353,8 +1346,6 @@ create_and_set_up_tree_view (FMListView *view)
 				 "changed",
 				 G_CALLBACK (list_selection_changed_callback), view, 0);
 
-	g_signal_connect_object (view->details->tree_view, "drag_begin",
-				 G_CALLBACK (drag_begin_callback), view, 0);
 	g_signal_connect_object (view->details->tree_view, "drag_data_get",
 				 G_CALLBACK (drag_data_get_callback), view, 0);
 	g_signal_connect_object (view->details->tree_view, "motion_notify_event",
@@ -2706,8 +2697,6 @@ fm_list_view_init (FMListView *list_view)
 		 list_view, 0);
 	
 	list_view->details->type_select_state = NULL;
-	/* ensure that the zoom level is always set in begin_loading */
-	list_view->details->zoom_level = NAUTILUS_ZOOM_LEVEL_SMALLEST - 1;
 }
 
 static NautilusView *
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index b873cf92d..267149463 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -104,6 +104,9 @@ struct FMPropertiesWindowDetails {
 	guint update_directory_contents_timeout_id;
 	guint update_files_timeout_id;
 
+	GList *directory_contents_widgets;
+	int directory_contents_row;
+
 	GList *special_flags_widgets;
 	int first_special_flags_row;
 	int num_special_flags_rows;
@@ -1867,8 +1870,7 @@ directory_contents_value_field_update (FMPropertiesWindow *window)
 					 &directory_count,
 					 &file_count, 
 					 &file_unreadable,
-					 &file_size,
-					 TRUE);
+					 &file_size);
 			total_count += (file_count + directory_count);
 			total_size += file_size;
 			
@@ -1999,6 +2001,7 @@ attach_directory_contents_value_field (FMPropertiesWindow *window,
 	/* Fill in the initial value. */
 	directory_contents_value_field_update (window);
  
+	       
 	for (l = window->details->target_files; l; l = l->next) {
 		file = NAUTILUS_FILE (l->data);
 		nautilus_file_recompute_deep_counts (file);
@@ -2097,6 +2100,44 @@ update_visibility_of_table_rows (GtkTable *table,
 	}
 }				   
 
+static void
+update_visibility_of_item_count_fields (FMPropertiesWindow *window)
+{
+	gboolean should_show_count;
+	GList *l;
+	guint count = 0;
+	NautilusFile *file;
+               
+	for (l = window->details->target_files; l; l = l->next) {
+		file = NAUTILUS_FILE (l->data);
+		count += nautilus_file_should_show_directory_item_count (file);
+	}
+	should_show_count = count;
+
+	update_visibility_of_table_rows
+		(window->details->basic_table,
+		 should_show_count,
+		 window->details->directory_contents_row,
+		 1,
+		 window->details->directory_contents_widgets);
+}
+
+static void
+update_visibility_of_item_count_fields_wrapper (gpointer callback_data)
+{
+	update_visibility_of_item_count_fields (FM_PROPERTIES_WINDOW (callback_data));
+}  
+
+static void
+remember_directory_contents_widget (FMPropertiesWindow *window, GtkWidget *widget)
+{
+	g_assert (FM_IS_PROPERTIES_WINDOW (window));
+	g_assert (GTK_IS_WIDGET (widget));
+	
+	window->details->directory_contents_widgets = 
+		g_list_prepend (window->details->directory_contents_widgets, widget);
+}
+
 static guint
 append_directory_contents_fields (FMPropertiesWindow *window,
 				  GtkTable *table)
@@ -2113,6 +2154,17 @@ append_directory_contents_fields (FMPropertiesWindow *window,
 	value_field = attach_directory_contents_value_field 
 		(window, table, last_row);
 
+	remember_directory_contents_widget (window, GTK_WIDGET (title_field));
+	remember_directory_contents_widget (window, GTK_WIDGET (value_field));
+	window->details->directory_contents_row = last_row;
+
+	update_visibility_of_item_count_fields (window);
+	eel_preferences_add_callback_while_alive 
+		(NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
+		 update_visibility_of_item_count_fields_wrapper,
+		 window,
+		 G_OBJECT (window));
+	
 	return last_row;
 }
 
@@ -3694,6 +3746,9 @@ real_destroy (GtkObject *object)
 	window->details->changed_files = NULL;
  
 	window->details->name_field = NULL;
+	
+	g_list_free (window->details->directory_contents_widgets);
+	window->details->directory_contents_widgets = NULL;
 
 	g_list_free (window->details->special_flags_widgets);
 	window->details->special_flags_widgets = NULL;
diff --git a/src/nautilus-actions.h b/src/nautilus-actions.h
index 77c92f265..e7296262e 100644
--- a/src/nautilus-actions.h
+++ b/src/nautilus-actions.h
@@ -42,5 +42,6 @@
 #define NAUTILUS_ACTION_ZOOM_OUT "Zoom Out"
 #define NAUTILUS_ACTION_ZOOM_NORMAL "Zoom Normal"
 #define NAUTILUS_ACTION_CLOSE "Close"
+#define NAUTILUS_ACTION_SEARCH "Search"
 
 #endif /* NAUTILUS_ACTIONS_H */
diff --git a/src/nautilus-connect-server-dialog-main.c b/src/nautilus-connect-server-dialog-main.c
index 65d8e0868..f9248cc9d 100644
--- a/src/nautilus-connect-server-dialog-main.c
+++ b/src/nautilus-connect-server-dialog-main.c
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
 
 	gtk_window_set_default_icon_name ("gnome-fs-directory");
 
-	dialog = nautilus_connect_server_dialog_new (NULL, NULL);
+	dialog = nautilus_connect_server_dialog_new (NULL);
 
 	open_dialogs = 1;
 	g_signal_connect (dialog, "destroy",
diff --git a/src/nautilus-connect-server-dialog.c b/src/nautilus-connect-server-dialog.c
index 331a70f8c..6ff52948c 100644
--- a/src/nautilus-connect-server-dialog.c
+++ b/src/nautilus-connect-server-dialog.c
@@ -212,20 +212,14 @@ connect_to_server (NautilusConnectServerDialog *dialog)
 			g_free (t);
 		}
 		if (dialog->details->domain_entry->parent != NULL) {
+	
 			free_domain = TRUE;
 
 			domain = gtk_editable_get_chars (GTK_EDITABLE (dialog->details->domain_entry), 0, -1);
 			
 			if (strlen (domain) != 0) {
-				t = user;
-
-				user = g_strconcat (domain , ";" , t, NULL);
-
-				if (free_user) {
-					g_free (t);
-				}
-
-				free_user = TRUE;
+				g_free (user);
+				user = g_strconcat (domain , ";" , user, NULL);
 			}
 		}
 
@@ -764,35 +758,16 @@ nautilus_connect_server_dialog_init (NautilusConnectServerDialog *dialog)
 }
 
 GtkWidget *
-nautilus_connect_server_dialog_new (NautilusWindow *window, const gchar *location)
+nautilus_connect_server_dialog_new (NautilusWindow *window)
 {
-	NautilusConnectServerDialog *conndlg;
 	GtkWidget *dialog;
-	GnomeVFSURI *uri;
 
 	dialog = gtk_widget_new (NAUTILUS_TYPE_CONNECT_SERVER_DIALOG, NULL);
 
 	if (window) {
-		conndlg = NAUTILUS_CONNECT_SERVER_DIALOG (dialog);
-
 		gtk_window_set_screen (GTK_WINDOW (dialog),
 				       gtk_window_get_screen (GTK_WINDOW (window)));
-		conndlg->details->application = window->application;
-
-		if (location) {
-			uri = gnome_vfs_uri_new (location);
-			g_return_val_if_fail (uri != NULL, dialog);
-
-			/* ... and if it's a remote URI, then load as the default */
-			if (!g_str_equal (gnome_vfs_uri_get_scheme (uri), "file") && 
-			    !gnome_vfs_uri_is_local (uri)) {
-
-				gtk_combo_box_set_active (GTK_COMBO_BOX (conndlg->details->type_combo), TYPE_URI);
-				gtk_entry_set_text (GTK_ENTRY (conndlg->details->uri_entry), location);
-			}
-;
-			gnome_vfs_uri_unref (uri);
-		}
+		NAUTILUS_CONNECT_SERVER_DIALOG (dialog)->details->application = window->application;
 	}
 
 	return dialog;
diff --git a/src/nautilus-connect-server-dialog.h b/src/nautilus-connect-server-dialog.h
index f84e35b53..c9bea7f41 100644
--- a/src/nautilus-connect-server-dialog.h
+++ b/src/nautilus-connect-server-dialog.h
@@ -46,8 +46,7 @@ struct _NautilusConnectServerDialogClass {
 };
 
 GType      nautilus_connect_server_dialog_get_type (void);
-GtkWidget* nautilus_connect_server_dialog_new      (NautilusWindow *window, 
-						    const gchar *uri);
+GtkWidget* nautilus_connect_server_dialog_new      (NautilusWindow *window);
 
 /* Private internal calls */
 
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 1887ad474..b400c2fff 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -497,12 +497,17 @@ nautilus_location_bar_set_location (NautilusNavigationBar *navigation_bar,
 
 	/* Note: This is called in reaction to external changes, and 
 	 * thus should not emit the LOCATION_CHANGED signal. */
-	
-	formatted_location = eel_format_uri_for_display (location);
-	nautilus_entry_set_text (NAUTILUS_ENTRY (bar->details->entry),
-				 formatted_location);
-	set_position_and_selection_to_end (GTK_EDITABLE (bar->details->entry));
-	g_free (formatted_location);
+
+	if (eel_uri_is_search (location)) {
+		nautilus_location_entry_set_special_text (NAUTILUS_LOCATION_ENTRY (bar->details->entry),
+							  "");
+	} else {
+		formatted_location = eel_format_uri_for_display (location);
+		nautilus_entry_set_text (NAUTILUS_ENTRY (bar->details->entry),
+					 formatted_location);
+		set_position_and_selection_to_end (GTK_EDITABLE (bar->details->entry));
+		g_free (formatted_location);
+	}
 
 	/* free up the cached file info from the previous location */
 	g_free (bar->details->current_directory);
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index f294124f3..6ede24c10 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -60,6 +60,10 @@ struct NautilusLocationEntryDetails {
 	GList *file_info_list;
 	
 	guint idle_id;
+
+	gboolean has_special_text;
+	gboolean setting_special_text;
+	gchar *special_text;
 };
 
 static void  nautilus_location_entry_class_init       (NautilusLocationEntryClass *class);
@@ -431,6 +435,7 @@ finalize (GObject *object)
 
 	entry = NAUTILUS_LOCATION_ENTRY (object);
 
+	g_free (entry->details->special_text);
 	g_free (entry->details);
 
 	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
@@ -461,11 +466,42 @@ destroy (GtkObject *object)
 }
 
 static void
+nautilus_location_entry_text_changed (NautilusLocationEntry *entry,
+				      GParamSpec            *pspec)
+{
+	if (entry->details->setting_special_text) {
+		return;
+	}
+
+	entry->details->has_special_text = FALSE;
+}
+
+static gboolean
+nautilus_location_entry_focus_in (GtkWidget     *widget,
+				  GdkEventFocus *event)
+{
+	NautilusLocationEntry *entry = NAUTILUS_LOCATION_ENTRY (widget);
+
+	if (entry->details->has_special_text) {
+		entry->details->setting_special_text = TRUE;
+		gtk_entry_set_text (GTK_ENTRY (entry), "");
+		entry->details->setting_special_text = FALSE;
+	}
+
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE (GTK_WIDGET_CLASS, focus_in_event, (widget, event));
+}
+
+static void
 nautilus_location_entry_class_init (NautilusLocationEntryClass *class)
 {
+	GtkWidgetClass *widget_class;
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 
+	widget_class = GTK_WIDGET_CLASS (class);
+
+	widget_class->focus_in_event = nautilus_location_entry_focus_in;
+
 	gobject_class = G_OBJECT_CLASS (class);
 	gobject_class->finalize = finalize;
 	
@@ -483,6 +519,9 @@ nautilus_location_entry_init (NautilusLocationEntry *entry)
 	g_signal_connect (entry, "event_after",
 		          G_CALLBACK (editable_event_after_callback), entry);
 
+	g_signal_connect (entry, "notify::text",
+			  G_CALLBACK (nautilus_location_entry_text_changed), NULL);
+
 }
 
 GtkWidget *
@@ -494,3 +533,18 @@ nautilus_location_entry_new (void)
 
 	return entry;
 }
+
+void
+nautilus_location_entry_set_special_text (NautilusLocationEntry *entry,
+					  const char            *special_text)
+{
+	entry->details->has_special_text = TRUE;
+	
+	g_free (entry->details->special_text);
+	entry->details->special_text = g_strdup (special_text);
+
+	entry->details->setting_special_text = TRUE;
+	gtk_entry_set_text (GTK_ENTRY (entry), special_text);
+	entry->details->setting_special_text = FALSE;
+}
+
diff --git a/src/nautilus-location-entry.h b/src/nautilus-location-entry.h
index 596f18a33..2869e112a 100644
--- a/src/nautilus-location-entry.h
+++ b/src/nautilus-location-entry.h
@@ -50,5 +50,7 @@ typedef struct {
 
 GType      nautilus_location_entry_get_type     	(void);
 GtkWidget* nautilus_location_entry_new          	(void);
+void       nautilus_location_entry_set_special_text     (NautilusLocationEntry *entry,
+							 const char            *special_text);
 
 #endif /* NAUTILUS_LOCATION_ENTRY_H */
diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml
index b15da7441..1da8913bc 100644
--- a/src/nautilus-navigation-window-ui.xml
+++ b/src/nautilus-navigation-window-ui.xml
@@ -31,6 +31,7 @@
 			<menuitem name="Go to Trash" action="Go to Trash"/>
 			<menuitem name="Go to Burn CD" action="Go to Burn CD"/>
 			<menuitem name="Go to Location" action="Go to Location"/>
+			<menuitem name="Search" action="Search"/>
 			<separator/>
 			<menuitem name="Clear History" action="Clear History"/>
 			<separator/>
@@ -54,7 +55,8 @@
 	<separator/>
 	<toolitem name="Home" action="Home"/>
 	<toolitem name="Computer" action="Go to Computer"/>
-
+	<separator/>
+	<toolitem name="Search" action="Search"/>
 	<placeholder name="Extra Buttons Placeholder">
 	          <placeholder name="Extension Actions"/>
         </placeholder>
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 29a0bf010..72d19c379 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -143,11 +143,19 @@ nautilus_navigation_window_instance_init (NautilusNavigationWindow *window)
 	gtk_table_attach (GTK_TABLE (NAUTILUS_WINDOW (window)->details->table),
 			  window->details->content_paned,
 			  /* X direction */                   /* Y direction */
-			  0, 1,                               3, 4,
+			  0, 1,                               4, 5,
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
 			  0,                                  0);
 	gtk_widget_show (window->details->content_paned);
 
+	window->details->content_vbox = gtk_vbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (window->details->content_vbox), 
+			    NAUTILUS_WINDOW (window)->details->search_bar, FALSE, FALSE, 0);
+	gtk_widget_show (window->details->content_vbox);
+	nautilus_horizontal_splitter_pack2 (
+		NAUTILUS_HORIZONTAL_SPLITTER (window->details->content_paned),
+		window->details->content_vbox);
+
 	nautilus_navigation_window_initialize_actions (window);
 	nautilus_navigation_window_initialize_menus (window);
 	
@@ -860,9 +868,8 @@ real_set_content_view_widget (NautilusWindow *nautilus_window,
 
 	connect_view (window, new_view);
 
-	nautilus_horizontal_splitter_pack2 (
-		NAUTILUS_HORIZONTAL_SPLITTER (window->details->content_paned),
-		GTK_WIDGET (new_view));
+	gtk_box_pack_start (GTK_BOX (window->details->content_vbox), 
+			    GTK_WIDGET (new_view), TRUE, TRUE, 0);
 
 	if (new_view != NULL && nautilus_view_supports_zooming (new_view)) {
 		gtk_widget_show (window->zoom_control);
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 7a57b0521..51db2e972 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -24,6 +24,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-preferences.h>
 #include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkalignment.h>
 #include <gtk/gtkarrow.h>
@@ -50,7 +51,8 @@ typedef enum {
         ROOT_BUTTON,
         HOME_BUTTON,
         DESKTOP_BUTTON,
-	VOLUME_BUTTON
+	VOLUME_BUTTON,
+	SEARCH_BUTTON
 } ButtonType;
 
 #define BUTTON_DATA(x) ((ButtonData *)(x))
@@ -68,6 +70,7 @@ static gboolean desktop_is_home;
 #define DEFAULT_DESKTOP_ICON 	"gnome-fs-desktop"
 #define DEFAULT_HOME_ICON 	"gnome-fs-home"
 #define DEFAULT_FILESYSTEM_ICON	"gnome-dev-harddisk"
+#define DEFAULT_SEARCH_ICON	"stock_search"
 
 typedef struct _ButtonData ButtonData;
 
@@ -305,6 +308,10 @@ nautilus_path_bar_finalize (GObject *object)
 		g_object_unref (path_bar->desktop_icon);
 		path_bar->desktop_icon = NULL;
 	}
+	if (path_bar->search_icon) {
+		g_object_unref (path_bar->search_icon);
+		path_bar->search_icon = NULL;
+	}
 
         G_OBJECT_CLASS (nautilus_path_bar_parent_class)->finalize (object);
 }
@@ -1102,6 +1109,15 @@ get_button_image (NautilusPathBar *path_bar,
 			g_free (icon_name);
       			return path_bar->desktop_icon;
 
+                case SEARCH_BUTTON:
+                      	if (path_bar->search_icon == NULL) {
+				path_bar->search_icon = nautilus_icon_factory_get_pixbuf_from_name (DEFAULT_SEARCH_ICON,
+												    NULL, NAUTILUS_PATH_BAR_ICON_SIZE,
+												    TRUE, NULL);
+			}
+
+      			return path_bar->search_icon;
+
 	    	default:
                        return NULL;
         }
@@ -1293,7 +1309,10 @@ find_button_type (NautilusPathBar  *path_bar,
 	}
 	if (is_file_path_mounted_volume (path, button_data)) {
 		return VOLUME_BUTTON;
-	}	
+	}
+	if (eel_uri_is_search (path)) {
+		return SEARCH_BUTTON;
+	}
 
  	return NORMAL_BUTTON;
 }
@@ -1354,6 +1373,7 @@ make_directory_button (NautilusPathBar  *path_bar,
                 case HOME_BUTTON:
                 case DESKTOP_BUTTON:
 		case VOLUME_BUTTON:
+		case SEARCH_BUTTON:
                         button_data->image = gtk_image_new ();
                         button_data->label = gtk_label_new (NULL);
                         label_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
@@ -1508,6 +1528,10 @@ get_display_name_for_folder (const char *file_path)
 	NautilusFile *file;
 	char *name;
 
+	if (eel_uri_is_search (file_path)) {
+		return g_strdup (_("Search"));
+	}
+
 	vfs_uri = gnome_vfs_uri_new (file_path);
  	if (vfs_uri == NULL) {
 		file = nautilus_file_get (file_path);
diff --git a/src/nautilus-pathbar.h b/src/nautilus-pathbar.h
index 5da857e00..aae303a50 100644
--- a/src/nautilus-pathbar.h
+++ b/src/nautilus-pathbar.h
@@ -45,6 +45,7 @@ struct _NautilusPathBar
 	GdkPixbuf *root_icon;
 	GdkPixbuf *home_icon;
 	GdkPixbuf *desktop_icon;
+	GdkPixbuf *search_icon;
 
 	GList *button_list;
 	GList *first_scrolled_button;
diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
new file mode 100644
index 000000000..7ddb758ed
--- /dev/null
+++ b/src/nautilus-search-bar.c
@@ -0,0 +1,250 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Anders Carlsson <andersca@imendio.com>
+ *
+ */
+
+#include <config.h>
+#include "nautilus-search-bar.h"
+
+#include <glib/gi18n.h>
+#include <eel/eel-gtk-macros.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkframe.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+
+struct NautilusSearchBarDetails {
+	GtkWidget *entry;
+	GtkWidget *search_button;
+};
+
+enum {
+	ACTIVATE,
+	LAST_SIGNAL
+}; 
+
+static guint signals[LAST_SIGNAL];
+
+static void  nautilus_search_bar_class_init       (NautilusSearchBarClass *class);
+static void  nautilus_search_bar_init             (NautilusSearchBar      *bar);
+
+EEL_CLASS_BOILERPLATE (NautilusSearchBar,
+		       nautilus_search_bar,
+		       GTK_TYPE_EVENT_BOX)
+
+static void
+finalize (GObject *object)
+{
+	NautilusSearchBar *bar;
+
+	bar = NAUTILUS_SEARCH_BAR (object);
+
+	g_free (bar->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+static void
+nautilus_search_bar_class_init (NautilusSearchBarClass *class)
+{
+	GObjectClass *gobject_class;
+
+	gobject_class = G_OBJECT_CLASS (class);
+	gobject_class->finalize = finalize;
+
+	signals[ACTIVATE] =
+		g_signal_new ("activate",
+		              G_TYPE_FROM_CLASS (class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusSearchBarClass, activate),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
+}
+
+static gboolean
+query_is_valid (NautilusSearchBar *bar)
+{
+	const char *text;
+
+	text = gtk_entry_get_text (GTK_ENTRY (bar->details->entry));
+
+	return text != NULL && text[0] != '\0';
+}
+
+static void
+button_clicked_cb (GtkWidget *entry, NautilusSearchBar *bar)
+{
+	if (query_is_valid (bar)) {
+		g_signal_emit (bar, signals[ACTIVATE], 0);
+	}
+}
+
+static void
+entry_activate_cb (GtkWidget *entry, NautilusSearchBar *bar)
+{
+	gtk_widget_activate (bar->details->search_button);
+}
+
+static void
+entry_changed_cb (GtkWidget *entry, NautilusSearchBar *bar)
+{
+	gtk_widget_set_sensitive (bar->details->search_button,
+				  query_is_valid (bar));
+}
+
+static void
+nautilus_search_bar_init (NautilusSearchBar *bar)
+{
+	GtkWidget *alignment;
+	GtkWidget *hbox;
+	GtkWidget *image;
+	GtkWidget *label, *frame, *event_box;
+
+	bar->details = g_new0 (NautilusSearchBarDetails, 1);
+
+	gtk_widget_modify_bg (GTK_WIDGET (bar),
+			      GTK_STATE_NORMAL, 
+			      &GTK_WIDGET (bar)->style->bg[GTK_STATE_SELECTED]);
+
+	alignment = gtk_alignment_new (0.5, 0.5,
+				       1.0, 1.0);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
+				   6, 6, 6, 6);
+	gtk_widget_show (alignment);
+	gtk_container_add (GTK_CONTAINER (bar), alignment);
+
+	hbox = gtk_hbox_new (FALSE, 6);
+	gtk_widget_show (hbox);
+
+	gtk_container_add (GTK_CONTAINER (alignment), hbox);
+
+	label = gtk_label_new ("Search");
+	gtk_widget_modify_fg (GTK_WIDGET (label),
+			      GTK_STATE_NORMAL,
+			      &GTK_WIDGET (label)->style->fg[GTK_STATE_SELECTED]);
+	gtk_widget_show (label);
+
+	frame = gtk_frame_new (NULL);
+	gtk_widget_modify_bg (GTK_WIDGET (frame),
+			      GTK_STATE_NORMAL,
+			      &GTK_WIDGET (frame)->style->bg[GTK_STATE_SELECTED]);
+	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+	gtk_widget_show (frame);
+	alignment = gtk_alignment_new (0.5, 0.5,
+				       1.0, 1.0);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
+				   2, 2, 2, 2);
+	gtk_widget_show (alignment);
+
+	event_box = gtk_event_box_new ();
+	gtk_widget_modify_bg (GTK_WIDGET (event_box),
+			      GTK_STATE_NORMAL,
+			      &GTK_WIDGET (event_box)->style->bg[GTK_STATE_SELECTED]);
+	gtk_widget_show (event_box);
+	gtk_container_add (GTK_CONTAINER (frame), event_box);
+
+	gtk_container_add (GTK_CONTAINER (event_box), alignment);
+	gtk_container_add (GTK_CONTAINER (alignment), label);
+	gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
+
+	bar->details->entry = gtk_entry_new ();
+	gtk_box_pack_start (GTK_BOX (hbox), bar->details->entry, TRUE, TRUE, 0);
+
+	image = gtk_image_new_from_icon_name ("stock_search", GTK_ICON_SIZE_MENU);
+	gtk_widget_show (image);
+	bar->details->search_button = gtk_button_new_with_label (_("Find Now"));
+	g_signal_connect (bar->details->search_button, "clicked",
+			  G_CALLBACK (button_clicked_cb), bar);
+	gtk_button_set_image (GTK_BUTTON (bar->details->search_button), image);
+	gtk_widget_set_sensitive (bar->details->search_button, FALSE);
+
+	gtk_widget_show (bar->details->search_button);
+	gtk_box_pack_start (GTK_BOX (hbox), bar->details->search_button, FALSE, FALSE, 0);
+	
+	g_signal_connect (bar->details->entry, "activate",
+			  G_CALLBACK (entry_activate_cb), bar);
+	g_signal_connect (bar->details->entry, "changed",
+			  G_CALLBACK (entry_changed_cb), bar);
+
+	gtk_widget_show (bar->details->entry);
+}
+
+void
+nautilus_search_bar_grab_focus (NautilusSearchBar *bar)
+{
+	gtk_widget_grab_focus (bar->details->entry);
+}
+
+NautilusQuery *
+nautilus_search_bar_get_query (NautilusSearchBar *bar)
+{
+	const char *query_text;
+	NautilusQuery *query;
+
+	query_text = gtk_entry_get_text (GTK_ENTRY (bar->details->entry));
+
+	/* Empty string is a NULL query */
+	if (query_text && query_text[0] == '\0') {
+		return NULL;
+	}
+	
+	query = nautilus_query_new ();
+	nautilus_query_set_text (query, query_text);
+
+	return query;
+}
+
+void
+nautilus_search_bar_clear_query (NautilusSearchBar *bar)
+{
+	gtk_entry_set_text (GTK_ENTRY (bar->details->entry), "");
+}
+
+GtkWidget *
+nautilus_search_bar_new (void)
+{
+	GtkWidget *bar;
+
+	bar = g_object_new (NAUTILUS_TYPE_SEARCH_BAR, NULL);
+
+	return bar;
+}
+
+void
+nautilus_search_bar_set_query (NautilusSearchBar *bar, NautilusQuery *query)
+{
+	const char *text;
+
+	if (!query) {
+		nautilus_search_bar_clear_query (bar);
+		return;
+	}
+
+	text = nautilus_query_get_text (query);
+	if (!text) {
+		text = "";
+	}
+	
+	gtk_entry_set_text (GTK_ENTRY (bar->details->entry), text);
+}
diff --git a/src/nautilus-search-bar.h b/src/nautilus-search-bar.h
new file mode 100644
index 000000000..5a9ae4fcc
--- /dev/null
+++ b/src/nautilus-search-bar.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * Nautilus 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.
+ *
+ * Nautilus 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; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Anders Carlsson <andersca@imendio.com>
+ *
+ */
+
+#ifndef NAUTILUS_SEARCH_BAR_H
+#define NAUTILUS_SEARCH_BAR_H
+
+#include <gtk/gtkeventbox.h>
+#include <libnautilus-private/nautilus-query.h>
+
+#define NAUTILUS_TYPE_SEARCH_BAR (nautilus_search_bar_get_type ())
+#define NAUTILUS_SEARCH_BAR(obj) \
+	GTK_CHECK_CAST (obj, NAUTILUS_TYPE_SEARCH_BAR, NautilusSearchBar)
+#define NAUTILUS_SEARCH_BAR_CLASS(klass) \
+	GTK_CHECK_CLASS_CAST (klass, NAUTILUS_TYPE_SEARCH_BAR, NautilusSearchBarClass)
+#define NAUTILUS_IS_SEARCH_BAR(obj) \
+	GTK_CHECK_TYPE (obj, NAUTILUS_TYPE_SEARCH_BAR)
+
+typedef struct NautilusSearchBarDetails NautilusSearchBarDetails;
+
+typedef struct NautilusSearchBar {
+	GtkEventBox parent;
+	NautilusSearchBarDetails *details;
+} NautilusSearchBar;
+
+typedef struct {
+	GtkEventBoxClass parent_class;
+
+	void (* activate) (NautilusSearchBar *bar);
+} NautilusSearchBarClass;
+
+GType      nautilus_search_bar_get_type     	(void);
+GtkWidget* nautilus_search_bar_new          	(void);
+
+void	   nautilus_search_bar_grab_focus (NautilusSearchBar *bar);
+void       nautilus_search_bar_clear_query (NautilusSearchBar *bar);
+
+NautilusQuery *nautilus_search_bar_get_query (NautilusSearchBar *bar);
+void           nautilus_search_bar_set_query (NautilusSearchBar *bar, NautilusQuery *query);
+
+#endif /* NAUTILUS_SEARCH_BAR_H */
diff --git a/src/nautilus-spatial-window-ui.xml b/src/nautilus-spatial-window-ui.xml
index 941450df7..eefb0d590 100644
--- a/src/nautilus-spatial-window-ui.xml
+++ b/src/nautilus-spatial-window-ui.xml
@@ -17,6 +17,7 @@
  		      <menuitem name="Go to Templates" action="Go to Templates"/>
 		      <menuitem name="Go to Trash" action="Go to Trash"/>
 		      <menuitem name="Go to Burn CD" action="Go to Burn CD"/>
+		      <menuitem name="Search" action="Search"/>
 		      <separator/>
 		      <placeholder name="Bookmarks Placeholder"/>
 		      <separator/>
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 4c2011c07..4fcf9d3da 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -758,7 +758,7 @@ nautilus_spatial_window_instance_init (NautilusSpatialWindow *window)
 	window->affect_spatial_window_on_next_location_change = TRUE;
 
 	window->details->content_box = 
-		gtk_hbox_new (FALSE, 0);
+		gtk_vbox_new (FALSE, 0);
 	gtk_table_attach (GTK_TABLE (NAUTILUS_WINDOW (window)->details->table),
 			  window->details->content_box,
 			  /* X direction */                   /* Y direction */
@@ -767,6 +767,9 @@ nautilus_spatial_window_instance_init (NautilusSpatialWindow *window)
 			  0,                                  0);
 	gtk_widget_show (window->details->content_box);
 
+	gtk_box_pack_start (GTK_BOX (window->details->content_box), 
+			    NAUTILUS_WINDOW (window)->details->search_bar, FALSE, FALSE, 0);
+
 	window->details->location_button = gtk_button_new ();
 	g_signal_connect (window->details->location_button,
 			  "button-press-event",
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 1219e12c6..99ff55e47 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -31,6 +31,7 @@
 #include "nautilus-actions.h"
 #include "nautilus-application.h"
 #include "nautilus-location-bar.h"
+#include "nautilus-search-bar.h"
 #include "nautilus-pathbar.h"
 #include "nautilus-main.h"
 #include "nautilus-window-private.h"
@@ -59,6 +60,7 @@
 #include <libnautilus-private/nautilus-metadata.h>
 #include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-monitor.h>
+#include <libnautilus-private/nautilus-search-directory.h>
 #include <libnautilus-private/nautilus-view-factory.h>
 #include <libnautilus-private/nautilus-window-info.h>
 
@@ -690,6 +692,7 @@ begin_location_change (NautilusWindow *window,
         NautilusFile *file;
 	gboolean force_reload;
         char *current_pos;
+	gboolean uri_is_search;
 
         g_assert (NAUTILUS_IS_WINDOW (window));
         g_assert (location != NULL);
@@ -704,6 +707,10 @@ begin_location_change (NautilusWindow *window,
         nautilus_window_allow_stop (window, TRUE);
         nautilus_window_set_status (window, " ");
 
+	uri_is_search = eel_uri_is_search (location);
+
+	nautilus_window_set_search_mode (window, uri_is_search);
+
 	g_assert (window->details->pending_location == NULL);
 	g_assert (window->details->pending_selection == NULL);
 	
@@ -717,6 +724,11 @@ begin_location_change (NautilusWindow *window,
         
         directory = nautilus_directory_get (location);
 
+	if (uri_is_search) {
+		nautilus_search_bar_set_query (NAUTILUS_SEARCH_BAR (window->details->search_bar),
+					       nautilus_search_directory_get_query (NAUTILUS_SEARCH_DIRECTORY (directory)));
+	}
+
 	/* The code to force a reload is here because if we do it
 	 * after determining an initial view (in the components), then
 	 * we end up fetching things twice.
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 1fea2e7c8..71caf459c 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -39,6 +39,7 @@
 #include "nautilus-window-bookmarks.h"
 #include "nautilus-window-private.h"
 #include "nautilus-desktop-window.h"
+#include "nautilus-search-bar.h"
 #include <eel/eel-debug.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gnome-extensions.h>
@@ -64,6 +65,8 @@
 #include <libnautilus-private/nautilus-icon-factory.h>
 #include <libnautilus-private/nautilus-module.h>
 #include <libnautilus-private/nautilus-undo-manager.h>
+#include <libnautilus-private/nautilus-search-directory.h>
+#include <libnautilus-private/nautilus-search-engine.h>
 
 #define MENU_PATH_EXTENSION_ACTIONS                     "/MenuBar/File/Extension Actions"
 #define POPUP_PATH_EXTENSION_ACTIONS                     "/background/Before Zoom Items/Extension Actions"
@@ -217,11 +220,9 @@ static void
 action_connect_to_server_callback (GtkAction *action, 
 				   gpointer user_data)
 {
-	NautilusWindow *window = NAUTILUS_WINDOW (user_data);
 	GtkWidget *dialog;
 	
-	dialog = nautilus_connect_server_dialog_new (window, nautilus_window_get_location (window));
-
+	dialog = nautilus_connect_server_dialog_new (NAUTILUS_WINDOW (user_data));
 	gtk_widget_show (dialog);
 }
 
@@ -274,6 +275,27 @@ action_go_to_computer_callback (GtkAction *action,
 }
 
 static void
+action_search (GtkAction *action,
+	       gpointer   user_data)
+{
+	char *uri;
+	NautilusWindow *window;
+
+	window = NAUTILUS_WINDOW (user_data);
+
+	if (window->details->search_mode) {
+		nautilus_search_bar_grab_focus (NAUTILUS_SEARCH_BAR (window->details->search_bar));
+		return;
+	}
+
+	uri = nautilus_search_directory_generate_new_uri ();
+
+	nautilus_window_go_to (window, uri);
+
+	g_free (uri);
+}
+
+static void
 action_go_to_templates_callback (GtkAction *action,
 				 gpointer user_data) 
 {
@@ -683,6 +705,10 @@ static const GtkActionEntry main_entries[] = {
     N_("CD/_DVD Creator"), NULL,           /* label, accelerator */
     N_("Go to the CD/DVD Creator"),                                  /* tooltip */ 
     G_CALLBACK (action_go_to_burn_cd_callback) },
+  { "Search", "gtk-find",					/* name, stock id */
+    N_("_Search"), "<control>F",	/* label, accelerator */
+    N_("Search for files"),
+    G_CALLBACK (action_search) }
 };
 
 /**
@@ -730,6 +756,12 @@ nautilus_window_initialize_menus (NautilusWindow *window)
 		gtk_action_set_visible (action, FALSE);
 	}
 
+	if (!nautilus_search_engine_enabled()) {
+		action = gtk_action_group_get_action (action_group, NAUTILUS_ACTION_SEARCH);
+		gtk_action_set_sensitive (action, FALSE);
+		gtk_action_set_visible (action, FALSE);
+	}
+
 	nautilus_window_initialize_bookmarks_menu (window);
 }
 
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index c2bf5f641..38878f3f4 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -94,6 +94,10 @@ struct NautilusWindowDetails
         guint location_change_at_idle_id;
 
         NautilusWindowShowHiddenFilesMode show_hidden_files_mode;
+
+        /* Search */
+        gboolean search_mode;
+        GtkWidget *search_bar;
 };
 
 struct _NautilusNavigationWindowDetails {
@@ -124,6 +128,8 @@ struct _NautilusNavigationWindowDetails {
 	/* Throbber */
         gboolean    throbber_active;
         GtkWidget  *throbber;
+
+        GtkWidget *content_vbox;
 };
 
 #define NAUTILUS_MENU_PATH_BACK_ITEM			"/menu/Go/Back"
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 9890f5b46..b737b686e 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -40,6 +40,7 @@
 #include "nautilus-window-manage-views.h"
 #include "nautilus-window-bookmarks.h"
 #include "nautilus-zoom-control.h"
+#include "nautilus-search-bar.h"
 #include <eel/eel-debug.h>
 #include <eel/eel-marshal.h>
 #include <eel/eel-gdk-extensions.h>
@@ -77,6 +78,7 @@
 #include <libnautilus-private/nautilus-view-factory.h>
 #include <libnautilus-private/nautilus-clipboard.h>
 #include <libnautilus-private/nautilus-undo.h>
+#include <libnautilus-private/nautilus-search-directory.h>
 #include <math.h>
 #include <sys/time.h>
 
@@ -137,12 +139,36 @@ icons_changed_callback (GObject *factory, NautilusWindow *window)
 }
 
 static void
+search_bar_activate_cb (NautilusSearchBar *bar, NautilusWindow *window)
+{
+	NautilusDirectory *directory;
+	NautilusSearchDirectory *search_directory;
+	NautilusQuery *query;
+
+	directory = nautilus_directory_get_for_file (window->details->viewed_file);
+
+	g_assert (NAUTILUS_IS_SEARCH_DIRECTORY (directory));
+
+	search_directory = NAUTILUS_SEARCH_DIRECTORY (directory);
+	query = nautilus_search_bar_get_query (bar);
+
+	nautilus_search_directory_set_query (search_directory, query);
+	if (query) {
+		g_object_unref (query);
+	}
+	nautilus_window_reload (window);
+
+	nautilus_directory_unref (directory);
+}
+
+static void
 nautilus_window_init (NautilusWindow *window)
 {
 	GtkWidget *table;
 	GtkWidget *menu;
 	GtkWidget *statusbar;
-      
+	GtkWidget *search_bar;
+
 	window->details = g_new0 (NautilusWindowDetails, 1);
 
 	window->details->show_hidden_files_mode = NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_DEFAULT;
@@ -150,7 +176,7 @@ nautilus_window_init (NautilusWindow *window)
 	/* Set initial window title */
 	gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
 
-	table = gtk_table_new (1, 5, FALSE);
+	table = gtk_table_new (1, 6, FALSE);
 	window->details->table = table;
 	gtk_widget_show (table);
 	gtk_container_add (GTK_CONTAINER (window), table);
@@ -161,7 +187,7 @@ nautilus_window_init (NautilusWindow *window)
 	gtk_table_attach (GTK_TABLE (table),
 			  statusbar,
 			  /* X direction */                   /* Y direction */
-			  0, 1,                               4, 5,
+			  0, 1,                               5, 6,
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
 			  0,                                  0);
 	window->details->help_message_cid = gtk_statusbar_get_context_id
@@ -180,7 +206,11 @@ nautilus_window_init (NautilusWindow *window)
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
 			  0,                                  0);
 
-	
+	search_bar = nautilus_search_bar_new ();
+	g_signal_connect (search_bar, "activate",
+			  G_CALLBACK (search_bar_activate_cb), window);
+	window->details->search_bar = search_bar;
+
 	/* Register IconFactory callback to update the window border icon
 	 * when the icon-theme is changed.
 	 */
@@ -610,6 +640,19 @@ nautilus_window_show_window (NautilusWindow *window)
 	if (window->details->viewed_file) {
 		if (NAUTILUS_IS_SPATIAL_WINDOW (window)) {
 			nautilus_file_set_has_open_window (window->details->viewed_file, TRUE);
+
+			/*
+			 * This is a quick hack to make sure that the
+			 * search entry are focused for new spatial
+			 * search windows. Ideally, the focus handling
+			 * should be fixed. Currently,
+			 * NautilusIconContainer grabs focus in its
+			 * realize handler. This will do for spatial
+			 * windows for now.
+			 */
+			if (window->details->search_mode) {
+				nautilus_search_bar_grab_focus (NAUTILUS_SEARCH_BAR (window->details->search_bar));
+			}
 		}
 	}
 }
@@ -1012,7 +1055,6 @@ nautilus_window_display_error (NautilusWindow *window, const char *error_msg)
 	gtk_widget_show (dialog);
 }
 
-
 static char *
 real_get_title (NautilusWindow *window)
 {
@@ -1197,6 +1239,27 @@ nautilus_window_get_ui_manager (NautilusWindow *window)
 }
 
 void
+nautilus_window_set_search_mode (NautilusWindow    *window,
+				 gboolean           search_mode)
+{
+	search_mode = search_mode != FALSE;
+
+	if (search_mode == window->details->search_mode) {
+		return;
+	}
+		
+	window->details->search_mode = search_mode;
+
+	if (search_mode) {
+		gtk_widget_show (window->details->search_bar);
+		nautilus_search_bar_clear_query (NAUTILUS_SEARCH_BAR (window->details->search_bar));
+		nautilus_search_bar_grab_focus (NAUTILUS_SEARCH_BAR (window->details->search_bar));
+	} else {
+		gtk_widget_hide (window->details->search_bar);
+	}
+}
+
+void
 nautilus_window_set_viewed_file (NautilusWindow *window,
 				 NautilusFile *file)
 {
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index a50aaa24f..951f92af4 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -29,8 +29,8 @@
 #ifndef NAUTILUS_WINDOW_H
 #define NAUTILUS_WINDOW_H
 
-#include <bonobo/bonobo-window.h>
 #include <gtk/gtkuimanager.h>
+#include <gtk/gtkwindow.h>
 #include <eel/eel-glib-extensions.h>
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-window-info.h>
@@ -143,4 +143,6 @@ void             nautilus_window_allow_burn_cd        (NautilusWindow    *window
                                                        gboolean           allow);
 GtkUIManager *   nautilus_window_get_ui_manager       (NautilusWindow    *window);
 
+void		 nautilus_window_set_search_mode      (NautilusWindow    *window,
+                                                       gboolean           search_mode);
 #endif
diff --git a/test/Makefile.am b/test/Makefile.am
index b6c59464e..b6fd4cd70 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -14,10 +14,16 @@ LDADD =\
 
 noinst_PROGRAMS =\
 	test-nautilus-wrap-table \
+	test-nautilus-search-engine \
+	test-nautilus-directory-async \
 	$(NULL)
 
 test_nautilus_wrap_table_SOURCES = test-nautilus-wrap-table.c test.c
 
+test_nautilus_search_engine_SOURCES = test-nautilus-search-engine.c 
+
+test_nautilus_directory_async_SOURCES = test-nautilus-directory-async.c
+
 EXTRA_DIST = \
 	test.h \
 	$(NULL)
diff --git a/test/test-nautilus-directory-async.c b/test/test-nautilus-directory-async.c
new file mode 100644
index 000000000..ed6eb35ae
--- /dev/null
+++ b/test/test-nautilus-directory-async.c
@@ -0,0 +1,106 @@
+#include <gtk/gtk.h>
+#include <libgnomevfs/gnome-vfs.h>
+#include <libnautilus-private/nautilus-directory.h>
+#include <libnautilus-private/nautilus-search-directory.h>
+#include <libnautilus-private/nautilus-file.h>
+#include <unistd.h>
+
+void *client1, *client2;
+
+#if 0
+static gboolean
+quit_cb (gpointer data)
+{
+	gtk_main_quit ();
+
+	return FALSE;
+}
+#endif
+
+static void
+files_added (NautilusDirectory *directory,
+	     GList *added_files)
+{
+#if 0
+	GList *list;
+
+	for (list = added_files; list != NULL; list = list->next) {
+		NautilusFile *file = list->data;
+
+		g_print (" - %s\n", nautilus_file_get_uri (file));
+	}
+#endif
+
+	g_print ("files added: %d files\n",
+		 g_list_length (added_files));
+}
+
+static void
+files_changed (NautilusDirectory *directory,
+	       GList *changed_files)
+{
+#if 0
+	GList *list;
+
+	for (list = changed_files; list != NULL; list = list->next) {
+		NautilusFile *file = list->data;
+
+		g_print (" - %s\n", nautilus_file_get_uri (file));
+	}
+#endif
+	g_print ("files changed: %d\n",
+		 g_list_length (changed_files));
+}
+
+static gboolean
+force_reload (NautilusDirectory *directory)
+{
+	g_print ("forcing reload!\n");
+
+	nautilus_directory_force_reload (directory);
+
+	return FALSE;
+}
+
+static void
+done_loading (NautilusDirectory *directory)
+{
+	static int i = 0;
+
+	g_print ("done loading\n");
+
+	if (i == 0) {
+		gtk_timeout_add (5000, (GSourceFunc)force_reload, directory);
+		i++;
+	} else {
+	}
+}
+
+int
+main (int argc, char **argv)
+{
+	NautilusDirectory *directory;
+	client1 = g_new0 (int, 1);
+	client2 = g_new0 (int, 1);
+	NautilusQuery *query;
+
+	gnome_vfs_init ();
+	gtk_init (&argc, &argv);
+
+	query = nautilus_query_new ();
+	nautilus_query_set_text (query, "richard hult");
+	directory = nautilus_directory_get ("x-nautilus-search://0/");
+	nautilus_search_directory_set_query (NAUTILUS_SEARCH_DIRECTORY (directory), query);
+	g_object_unref (query);
+
+	g_signal_connect (directory, "files-added", G_CALLBACK (files_added), NULL);
+	g_signal_connect (directory, "files-changed", G_CALLBACK (files_changed), NULL);
+	g_signal_connect (directory, "done-loading", G_CALLBACK (done_loading), NULL);
+	nautilus_directory_file_monitor_add (directory, client1, TRUE, TRUE,
+					     NAUTILUS_FILE_ATTRIBUTE_METADATA, 
+					     NULL, NULL);
+
+
+	gtk_main ();
+	return 0;
+}
diff --git a/test/test-nautilus-search-engine.c b/test/test-nautilus-search-engine.c
new file mode 100644
index 000000000..f6224d004
--- /dev/null
+++ b/test/test-nautilus-search-engine.c
@@ -0,0 +1,56 @@
+#include <libnautilus-private/nautilus-search-engine.h>
+#include <gtk/gtk.h>
+
+static void
+hits_added_cb (NautilusSearchEngine *engine, GSList *hits)
+{      
+	g_print ("hits added\n");
+	while (hits) {
+		g_print (" - %s\n", (char *)hits->data);
+		hits = hits->next;
+	}
+}
+
+static void
+hits_subtracted_cb (NautilusSearchEngine *engine, GSList *hits)
+{
+	g_print ("hits subtracted\n");
+	while (hits) {
+		g_print (" - %s\n", (char *)hits->data);
+		hits = hits->next;
+	}
+}
+
+static void
+finished_cb (NautilusSearchEngine *engine)
+{
+	g_print ("finished!\n");
+//	gtk_main_quit ();
+}
+
+int 
+main (int argc, char* argv[])
+{
+	NautilusSearchEngine *engine;
+	NautilusQuery *query;
+
+	gtk_init (&argc, &argv);
+
+	engine = nautilus_search_engine_new ();
+	g_signal_connect (engine, "hits-added", 
+			  G_CALLBACK (hits_added_cb), NULL);
+	g_signal_connect (engine, "hits-subtracted", 
+			  G_CALLBACK (hits_subtracted_cb), NULL);
+	g_signal_connect (engine, "finished", 
+			  G_CALLBACK (finished_cb), NULL);
+
+	query = nautilus_query_new ();
+	nautilus_query_set_text (query, "richard hult");
+	nautilus_search_engine_set_query (engine, query);
+	g_object_unref (query);
+
+	nautilus_search_engine_start (engine);
+       
+	gtk_main ();
+	return 0;
+}